- some refactoring - working xbel and html import (/api/ymarks/test_import.html) - working treeview (/api/ymarks/test_treeview.html) git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7312 6c8d7289-2bf4-0310-a012-ef5d649a1542pull/1/head
parent
2c539b514a
commit
808edffaf6
@ -0,0 +1,80 @@
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
|
||||
import net.yacy.cora.protocol.RequestHeader;
|
||||
import net.yacy.document.parser.html.CharacterCoding;
|
||||
import net.yacy.kelondro.blob.Tables;
|
||||
import net.yacy.kelondro.logging.Log;
|
||||
import de.anomic.data.BookmarkHelper;
|
||||
import de.anomic.data.YMarkIndex;
|
||||
import de.anomic.data.YMarkTables;
|
||||
import de.anomic.data.userDB;
|
||||
import de.anomic.search.Switchboard;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
|
||||
public class get_xbel {
|
||||
public static final String ROOT = "root";
|
||||
public static final String SOURCE = "source";
|
||||
|
||||
static serverObjects prop;
|
||||
|
||||
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
|
||||
final Switchboard sb = (Switchboard) env;
|
||||
prop = new serverObjects();
|
||||
final userDB.Entry user = sb.userDB.getUser(header);
|
||||
final boolean isAdmin = (sb.verifyAuthentication(header, true));
|
||||
final boolean isAuthUser = user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT);
|
||||
|
||||
if(isAdmin || isAuthUser) {
|
||||
final String bmk_user = (isAuthUser ? user.getUserName() : YMarkTables.USER_ADMIN);
|
||||
|
||||
String root = YMarkTables.FOLDERS_ROOT;
|
||||
String[] foldername = null;
|
||||
|
||||
if (post != null){
|
||||
if (post.containsKey(ROOT)) {
|
||||
if (post.get(ROOT).equals(SOURCE) || post.get(ROOT).equals(YMarkTables.FOLDERS_ROOT)) {
|
||||
root = "";
|
||||
} else if (post.get(ROOT).startsWith(YMarkTables.FOLDERS_ROOT)) {
|
||||
root = post.get(ROOT);
|
||||
} else {
|
||||
root = YMarkTables.FOLDERS_ROOT + post.get(ROOT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Iterator<String> it = null;
|
||||
Tables.Row bmk_row = null;
|
||||
int count = 0;
|
||||
|
||||
// <![CDATA[
|
||||
// ]]>
|
||||
// loop through folderList
|
||||
try {
|
||||
it = sb.tables.bookmarks.folders.getFolders(bmk_user, root);
|
||||
} catch (IOException e) {
|
||||
Log.logException(e);
|
||||
}
|
||||
int n = YMarkIndex.getFolderDepth(root);;
|
||||
|
||||
|
||||
while (it.hasNext()) {
|
||||
String folder = it.next();
|
||||
foldername = folder.split(YMarkTables.FOLDERS_SEPARATOR);
|
||||
if (foldername.length == n+1) {
|
||||
prop.put("xbel_"+count+"_elements", "<folder id=\""+new String(YMarkTables.getKeyId(foldername[n]))+"\">");
|
||||
count++;
|
||||
prop.put("xbel_"+count+"_elements", "<title>" + CharacterCoding.unicode2xml(foldername[n], true) + "</title>");
|
||||
count++;
|
||||
// print bookmars
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
prop.put(YMarkTables.USER_AUTHENTICATE,YMarkTables.USER_AUTHENTICATE_MSG);
|
||||
}
|
||||
// return rewrite properties
|
||||
return prop;
|
||||
}
|
||||
}
|
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE xbel PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML" "http://pyxml.sourceforge.net/topics/dtds/xbel-1.0.dtd">
|
||||
#(style)#::<?xml-stylesheet type="text/#[type]#" href="#[href]#" ?>#(/style)#
|
||||
<xbel>
|
||||
#{xbel}#
|
||||
#[elements]#
|
||||
#{/xbel}#
|
||||
</xbel>
|
@ -1,91 +0,0 @@
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import net.yacy.cora.protocol.RequestHeader;
|
||||
import net.yacy.kelondro.blob.Tables;
|
||||
import net.yacy.kelondro.index.RowSpaceExceededException;
|
||||
import net.yacy.kelondro.logging.Log;
|
||||
import de.anomic.data.YMarkTables;
|
||||
import de.anomic.data.userDB;
|
||||
import de.anomic.search.Switchboard;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
|
||||
|
||||
public class get_ymark_list {
|
||||
|
||||
private static Switchboard sb = null;
|
||||
private static serverObjects prop = null;
|
||||
|
||||
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
|
||||
sb = (Switchboard) env;
|
||||
prop = new serverObjects();
|
||||
|
||||
boolean tags = false;
|
||||
|
||||
final userDB.Entry user = sb.userDB.getUser(header);
|
||||
final boolean isAdmin = (sb.verifyAuthentication(header, true));
|
||||
final boolean isAuthUser = user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT);
|
||||
final TreeSet<String> bookmarks = new TreeSet<String>();
|
||||
|
||||
if(isAdmin || isAuthUser) {
|
||||
final String bmk_user = (isAuthUser ? user.getUserName() : YMarkTables.USER_ADMIN);
|
||||
|
||||
if(post.containsKey(YMarkTables.BOOKMARK.TAGS.key())) {
|
||||
tags = true;
|
||||
final String[] tagArray = YMarkTables.cleanTagsString(post.get(YMarkTables.BOOKMARK.TAGS.key())).split(YMarkTables.TAGS_SEPARATOR);
|
||||
try {
|
||||
bookmarks.addAll(sb.tables.bookmarks.tags.getBookmarks(bmk_user, tagArray));
|
||||
} catch (IOException e) {
|
||||
Log.logException(e);
|
||||
} catch (RowSpaceExceededException e) {
|
||||
Log.logException(e);
|
||||
}
|
||||
}
|
||||
if(post.containsKey(YMarkTables.BOOKMARK.FOLDERS.key())) {
|
||||
final String[] folderArray = YMarkTables.cleanFoldersString(post.get(YMarkTables.BOOKMARK.FOLDERS.key())).split(YMarkTables.TAGS_SEPARATOR);
|
||||
try {
|
||||
if(tags)
|
||||
bookmarks.retainAll(sb.tables.bookmarks.folders.getBookmarks(bmk_user, folderArray));
|
||||
else
|
||||
bookmarks.addAll(sb.tables.bookmarks.folders.getBookmarks(bmk_user, folderArray));
|
||||
} catch (IOException e) {
|
||||
Log.logException(e);
|
||||
} catch (RowSpaceExceededException e) {
|
||||
Log.logException(e);
|
||||
}
|
||||
}
|
||||
putBookmarks(bookmarks, YMarkTables.TABLES.BOOKMARKS.tablename(bmk_user));
|
||||
|
||||
} else {
|
||||
prop.put(YMarkTables.USER_AUTHENTICATE,YMarkTables.USER_AUTHENTICATE_MSG);
|
||||
}
|
||||
// return rewrite properties
|
||||
return prop;
|
||||
}
|
||||
|
||||
private static void putBookmarks(final TreeSet<String> urlSet, final String bmk_table) {
|
||||
final Iterator<String>urlIter = urlSet.iterator();
|
||||
int count = 0;
|
||||
while(urlIter.hasNext()) {
|
||||
final byte[] urlHash = urlIter.next().getBytes();
|
||||
Tables.Row bmk_row = null;
|
||||
try {
|
||||
bmk_row = sb.tables.select(bmk_table, urlHash);
|
||||
if (bmk_row != null) {
|
||||
prop.putXML("bookmarks_"+count+"_id", new String(urlHash));
|
||||
for (YMarkTables.BOOKMARK bmk : YMarkTables.BOOKMARK.values()) {
|
||||
prop.putXML("bookmarks_"+count+"_"+bmk.key(), new String(bmk_row.get(bmk.key(),bmk.deflt())));
|
||||
}
|
||||
count++;
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Log.logException(e);
|
||||
} catch (RowSpaceExceededException e) {
|
||||
Log.logException(e);
|
||||
}
|
||||
}
|
||||
prop.put("bookmarks", count);
|
||||
}
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<posts>
|
||||
#{bookmarks}#
|
||||
<post href="#[url]#" id="#[id]#" title="#[title]#" tag="#[tags]#" folders="#[folders]#" added="#[date_added]#"/>
|
||||
#{/bookmarks}#
|
||||
</posts>
|
@ -1,136 +0,0 @@
|
||||
package de.anomic.data;
|
||||
|
||||
import java.net.MalformedURLException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.Set;
|
||||
|
||||
import net.yacy.kelondro.data.meta.DigestURI;
|
||||
import net.yacy.kelondro.data.word.Word;
|
||||
|
||||
public class YMarkStatics {
|
||||
|
||||
public final static String TABLE_BOOKMARKS_BASENAME = "_bookmarks";
|
||||
public final static String TABLE_BOOKMARKS_LOG = "BOOKMARKS";
|
||||
|
||||
public final static String TABLE_BOOKMARKS_USER_ADMIN = "admin";
|
||||
public final static String TABLE_BOOKMARKS_USER_AUTHENTICATE = "AUTHENTICATE";
|
||||
public final static String TABLE_BOOKMARKS_USER_AUTHENTICATE_MSG = "Authentication required!";
|
||||
|
||||
public final static String TABLE_BOOKMARKS_URL_PROTOCOL_HTTP = "http://";
|
||||
public final static String TABLE_BOOKMARKS_URL_PROTOCOL_HTTPS = "https://";
|
||||
|
||||
public final static String TABLE_BOOKMARKS_COL_ID = "id";
|
||||
public final static String TABLE_BOOKMARKS_COL_URL = "url";
|
||||
public final static String TABLE_BOOKMARKS_COL_TITLE = "title";
|
||||
public final static String TABLE_BOOKMARKS_COL_DESC = "desc";
|
||||
public final static String TABLE_BOOKMARKS_COL_DATE_ADDED = "added";
|
||||
public final static String TABLE_BOOKMARKS_COL_DATE_MODIFIED = "modified";
|
||||
public final static String TABLE_BOOKMARKS_COL_DATE_VISITED = "visited";
|
||||
public final static String TABLE_BOOKMARKS_COL_PUBLIC = "public";
|
||||
public final static String TABLE_BOOKMARKS_COL_TAGS = "tags";
|
||||
|
||||
public final static String TABLE_BOOKMARKS_COL_DEFAULT = "";
|
||||
public final static String TABLE_BOOKMARKS_COL_PUBLIC_TRUE = "true";
|
||||
public final static String TABLE_BOOKMARKS_COL_PUBLIC_FALSE = "false";
|
||||
|
||||
public final static String TABLE_TAGS_BASENAME = "_tags";
|
||||
public final static String TABLE_TAGS_SEPARATOR = ",";
|
||||
|
||||
public final static String TABLE_TAGS_COL_ID = "id";
|
||||
public final static String TABLE_TAGS_COL_TAG = "tag";
|
||||
public final static String TABLE_TAGS_COL_URLS = "urls";
|
||||
|
||||
public final static int TABLE_TAGS_ACTION_ADD = 1;
|
||||
public final static int TABLE_TAGS_ACTION_REMOVE = 2;
|
||||
|
||||
public final static byte[] getBookmarkId(String url) throws MalformedURLException {
|
||||
if (!url.toLowerCase().startsWith(TABLE_BOOKMARKS_URL_PROTOCOL_HTTP) && !url.toLowerCase().startsWith(TABLE_BOOKMARKS_URL_PROTOCOL_HTTPS)) {
|
||||
url=TABLE_BOOKMARKS_URL_PROTOCOL_HTTP+url;
|
||||
}
|
||||
return (new DigestURI(url, null)).hash();
|
||||
}
|
||||
|
||||
public final static byte[] getTagHash(final String tag) {
|
||||
return Word.word2hash(tag.toLowerCase());
|
||||
}
|
||||
|
||||
public final static HashSet<String> getTagSet(final String tagsString, boolean clean) {
|
||||
HashSet<String>tagSet = new HashSet<String>();
|
||||
final String[] tagArray = clean ? cleanTagsString(tagsString).split(TABLE_TAGS_SEPARATOR) : tagsString.split(TABLE_TAGS_SEPARATOR);
|
||||
for (final String tag : tagArray) {
|
||||
tagSet.add(tag);
|
||||
}
|
||||
return tagSet;
|
||||
}
|
||||
|
||||
public final static HashSet<String> getTagSet(final String tagsString) {
|
||||
return getTagSet(tagsString, true);
|
||||
}
|
||||
|
||||
public final static HashSet<byte[]> getTagIdSet(final String tagsString, boolean clean) {
|
||||
HashSet<byte[]>tagSet = new HashSet<byte[]>();
|
||||
final String[] tagArray = clean ? cleanTagsString(tagsString).split(TABLE_TAGS_SEPARATOR) : tagsString.split(TABLE_TAGS_SEPARATOR);
|
||||
for (final String tag : tagArray) {
|
||||
tagSet.add(getTagHash(tag));
|
||||
}
|
||||
return tagSet;
|
||||
}
|
||||
|
||||
public final static Set<byte[]> getTagIdSet(final String tagsString) {
|
||||
return getTagIdSet(tagsString, true);
|
||||
}
|
||||
|
||||
public final static byte[] keySetToBytes(final HashSet<String> urlSet) {
|
||||
final Iterator<String> urlIter = urlSet.iterator();
|
||||
final
|
||||
StringBuilder urls = new StringBuilder();
|
||||
while(urlIter.hasNext()) {
|
||||
urls.append(TABLE_TAGS_SEPARATOR);
|
||||
urls.append(urlIter.next());
|
||||
}
|
||||
urls.deleteCharAt(0);
|
||||
return urls.toString().getBytes();
|
||||
}
|
||||
|
||||
public final static HashSet<String> keysStringToKeySet(final String keysString) {
|
||||
HashSet<String> keySet = new HashSet<String>();
|
||||
final String[] keyArray = keysString.split(TABLE_TAGS_SEPARATOR);
|
||||
for (final String key : keyArray) {
|
||||
keySet.add(key);
|
||||
}
|
||||
return keySet;
|
||||
}
|
||||
|
||||
public final static String cleanTagsString(String tagsString) {
|
||||
// get rid of heading, trailing and double commas since they are useless
|
||||
while (tagsString.length() > 0 && tagsString.charAt(0) == TABLE_TAGS_SEPARATOR.charAt(0)) {
|
||||
tagsString = tagsString.substring(1);
|
||||
}
|
||||
while (tagsString.endsWith(TABLE_TAGS_SEPARATOR)) {
|
||||
tagsString = tagsString.substring(0,tagsString.length() -1);
|
||||
}
|
||||
while (tagsString.contains(",,")){
|
||||
tagsString = tagsString.replaceAll(",,", TABLE_TAGS_SEPARATOR);
|
||||
}
|
||||
// space characters following a comma are removed
|
||||
tagsString = tagsString.replaceAll(",\\s+", TABLE_TAGS_SEPARATOR);
|
||||
return tagsString;
|
||||
}
|
||||
|
||||
public final static String cleanFoldersString(String foldersString) {
|
||||
foldersString = cleanTagsString(foldersString);
|
||||
// get rid of double and trailing slashes
|
||||
while (foldersString.endsWith("/")){
|
||||
foldersString = foldersString.substring(0, foldersString.length() -1);
|
||||
}
|
||||
while (foldersString.contains("/,")){
|
||||
foldersString = foldersString.replaceAll("/,", TABLE_TAGS_SEPARATOR);
|
||||
}
|
||||
while (foldersString.contains("//")){
|
||||
foldersString = foldersString.replaceAll("//", "/");
|
||||
}
|
||||
return foldersString;
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in new issue