Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ymarks

Browse Source 
- 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-ef5d649a1542
This commit is contained in:
apfelmaennchen 2010-11-06 20:26:13 +00:00
parent 2c539b514a
commit 808edffaf6
17 changed files with 265 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htroot/api/ymarks/get_ymark_tree.java → htroot/api/ymarks/get_treeview.java
View File

@ -13,24 +13,11 @@ import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch;
public class get_ymark_tree {
public class get_treeview {
public static final String ROOT = "root";
public static final String SOURCE = "source";
// for some reason enums don't work in servlet classes ?!?!
/*
private static final Map<String, String> TYPE = createMap();
private static Map<String, String> createMap() {
Map<String, String> result = new HashMap<String, String>();
result.put("tags", "tag");
result.put("url", "link");
result.put("public", "lock");
result.put("visits", "stat");
return Collections.unmodifiableMap(result);
}
*/
static serverObjects prop;
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
@ -74,12 +61,11 @@ public class get_ymark_tree {
}
int n = root.split(YMarkTables.FOLDERS_SEPARATOR).length;
if (n == 0) n = 1;
while (it.hasNext()) {
String folder = it.next();
foldername = folder.split(YMarkTables.FOLDERS_SEPARATOR);
if (foldername.length == n+1) {
prop.put("folders_"+count+"_foldername", foldername[n]);
prop.put("folders_"+count+"_foldername", foldername[n]);
prop.put("folders_"+count+"_expanded", "false");
prop.put("folders_"+count+"_type", "folder");
prop.put("folders_"+count+"_hash", folder); //TODO: switch from pathString to folderHash
@ -161,7 +147,9 @@ public class get_ymark_tree {
Log.logException(e);
}
}
}
} else {
prop.put(YMarkTables.USER_AUTHENTICATE,YMarkTables.USER_AUTHENTICATE_MSG);
}
// return rewrite properties
return prop;
}

0
htroot/api/ymarks/get_ymark_tree.json → htroot/api/ymarks/get_treeview.json
View File

0
htroot/api/ymarks/get_ymark_tree.xml → htroot/api/ymarks/get_treeview.xml
View File

80
htroot/api/ymarks/get_xbel.java Normal file
View File

@ -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;
}
}

8
htroot/api/ymarks/get_xbel.xml Normal file
View File

@ -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>

91
htroot/api/ymarks/get_ymark_list.java
View File

@ -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);
}
}

6
htroot/api/ymarks/get_ymark_list.xml
View File

@ -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>

7
htroot/api/ymarks/import_html.java → htroot/api/ymarks/import_ymark.java
View File

@ -15,7 +15,7 @@ import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch;
public class import_html {
public class import_ymark {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final Switchboard sb = (Switchboard) env;
@ -49,6 +49,7 @@ public class import_html {
}
}
}
prop.put("result", "1");
}
if(post.containsKey("xbelfile")){
try {
@ -73,7 +74,9 @@ public class import_html {
}
prop.put("result", "1");
}
}
} else {
prop.put(YMarkTables.USER_AUTHENTICATE,YMarkTables.USER_AUTHENTICATE_MSG);
}
// return rewrite properties
return prop;
}

0
htroot/api/ymarks/import_html.xml → htroot/api/ymarks/import_ymark.xml
View File

4
htroot/api/ymarks/import.html → htroot/api/ymarks/test_import.html
View File

@ -4,7 +4,7 @@
<title>YaCy Bookmarks</title>
</head>
<body>
<form action="/api/ymarks/import_html.xml" method="post" enctype="multipart/form-data">
<form action="/api/ymarks/import_ymark.xml" method="post" enctype="multipart/form-data">
<fieldset>
<legend>Import HTML Bookmarks</legend>
<dl>
@ -33,7 +33,7 @@
<input type="submit" name="importbookmarks" value="import" />
</fieldset>
</form>
<form action="/api/ymarks/import_html.xml" method="post" enctype="multipart/form-data">
<form action="/api/ymarks/import_ymark.xml" method="post" enctype="multipart/form-data">
<fieldset>
<legend>Import XBEL Bookmarks</legend>
<dl>

2
htroot/api/ymarks/test.html → htroot/api/ymarks/test_treeview.html
View File

@ -10,7 +10,7 @@
//<![CDATA[
$(document).ready(function() {
$("#yfolder").treeview({
url: "/api/ymarks/get_ymark_tree.json?bmtype=href",
url: "/api/ymarks/get_treeview.json?bmtype=href",
unique: false,
toggle: function() {

4
htroot/yacy/ui/css/jquery.treeview.css
View File

@ -67,6 +67,7 @@
.filetree li.expandable span.folder { background: url(../img/treeview/folder-closed.gif) 0 0 no-repeat; }
.filetree span.file { background: url(../img-2/article_text.png) 0 0 no-repeat; }
.filetree span.comment,
.filetree span.meta,
.filetree span.date,
.filetree span.lock,
@ -78,4 +79,5 @@
.filetree span.lock { background: url(../img-2/lock.png) 0 0 no-repeat; }
.filetree span.stat { background: url(../img-2/bar_graph.png) 0 0 no-repeat; }
.filetree span.link { background: url(../img-2/link.png) 0 0 no-repeat; }
.filetree span.tag { background: url(../img/tags/tag_blue.png) 0 0 no-repeat; }
.filetree span.tag { background: url(../img/tags/tag_blue.png) 0 0 no-repeat; }
.filetree span.comment { background: url(../img-2/comment_blue.png) 0 0 no-repeat; }

28
source/de/anomic/data/YMarkIndex.java
View File

@ -40,10 +40,9 @@ public class YMarkIndex {
ADD,
REMOVE
}
public final static String PATTERN_PREFIX = "^";
public final static String PATTERN_POSTFIX = YMarkTables.FOLDERS_SEPARATOR + ".*$";
public final static String PATTERN_REPLACE = "("+YMarkTables.FOLDERS_SEPARATOR+".[^"+YMarkTables.FOLDERS_SEPARATOR+"]*$)";
public final static String PATTERN_PREFIX = "^\\Q";
public final static String PATTERN_POSTFIX = YMarkTables.FOLDERS_SEPARATOR+"\\E.*$";
private final WorkTables worktables;
private final String table_basename;
@ -61,21 +60,30 @@ public class YMarkIndex {
return new String(row.get(INDEX.NAME.key(), INDEX.NAME.deflt()));
}
public static int getFolderDepth(String folder) {
final int depth = folder.split(YMarkTables.FOLDERS_SEPARATOR).length;
if (depth == 0)
return 1;
else
return depth;
}
public Iterator<String> getFolders(final String user, final String root) throws IOException {
final String index_table = user + this.table_basename;
final TreeSet<String> folders = new TreeSet<String>();
final Pattern r = Pattern.compile(PATTERN_PREFIX + root + PATTERN_POSTFIX);
final Iterator<Row> it = this.worktables.iterator(index_table, INDEX.NAME.key(), r);
String path = "";
final StringBuilder path = new StringBuilder(100);
Row folder;
while (it.hasNext()) {
folder = it.next();
path = new String(folder.get(INDEX.NAME.key(), INDEX.NAME.deflt()));
while(path.length() > 0 && !path.equals(root)){
folders.add(path);
path = path.replaceAll(PATTERN_REPLACE, "");
path.setLength(0);
path.append(new String(folder.get(INDEX.NAME.key(), INDEX.NAME.deflt())));
//TODO: get rid of .toString.equals()
while(path.length() > 0 && !path.toString().equals(root)){
folders.add(path.toString());
path.setLength(path.lastIndexOf(YMarkTables.FOLDERS_SEPARATOR));
}
}
if (!root.equals(YMarkTables.FOLDERS_ROOT)) { folders.add(root); }

136
source/de/anomic/data/YMarkStatics.java
View File

@ -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;
}
}

37
source/de/anomic/data/YMarkTables.java
View File

@ -2,6 +2,9 @@ package de.anomic.data;
import java.io.IOException;
import java.net.MalformedURLException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@ -13,6 +16,7 @@ import net.yacy.kelondro.blob.Tables.Data;
import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.kelondro.data.word.Word;
import net.yacy.kelondro.index.RowSpaceExceededException;
import net.yacy.kelondro.logging.Log;
public class YMarkTables {
@ -50,7 +54,7 @@ public class YMarkTables {
return this.protocol+s;
}
}
public static enum BOOKMARK {
URL ("url", "", "href", "href", "link"),
TITLE ("title", "", "", "", "meta"),
@ -113,16 +117,14 @@ public class YMarkTables {
public final static String FOLDERS_ROOT = "/";
public final static String FOLDERS_UNSORTED = "/unsorted";
public final static String FOLDERS_IMPORTED = "/imported";
public static final int FOLDER_BUFFER_SIZE = 100;
public final static String BOOKMARKS_LOG = "BOOKMARKS";
public final static String BOOKMARKS_ID = "id";
public final static String USER_ADMIN = "admin";
public final static String USER_AUTHENTICATE = "AUTHENTICATE";
public final static String USER_AUTHENTICATE_MSG = "Authentication required!";
private WorkTables worktables;
public YMarkIndex tags;
@ -134,6 +136,21 @@ public class YMarkTables {
this.tags = new YMarkIndex(this.worktables, TABLES.TAGS.basename());
}
public static Date parseISO8601(final String s) throws ParseException {
if(s == null)
throw new ParseException("parseISO8601 - NPE", 0);
StringBuilder date = new StringBuilder(s);
SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssz");
if(date.charAt(date.length()) == 'Z') {
date.deleteCharAt(date.length());
date.append("GMT-00:00");
} else {
date.insert(date.length()-6, "GMT");
}
Log.logInfo(YMarkTables.BOOKMARKS_LOG, "ISO8601: "+s+" =? "+dateformat.toString());
return dateformat.parse(date.toString());
}
public final static byte[] getBookmarkId(String url) throws MalformedURLException {
return (new DigestURI(url, null)).hash();
}
@ -166,7 +183,7 @@ public class YMarkTables {
}
return keySet;
}
public final static String cleanTagsString(final String tagsString) {
StringBuilder ts = new StringBuilder(tagsString);
// get rid of double commas and space characters following a comma
@ -244,14 +261,14 @@ public class YMarkTables {
switch(b) {
case DATE_ADDED:
case DATE_MODIFIED:
if(bmk.containsKey(b.key())) {
if(bmk.containsKey(b.key()) && bmk.get(b.key()) != null) {
data.put(b.key(), bmk.get(b.key()));
} else {
data.put(b.key(), String.valueOf(System.currentTimeMillis()).getBytes());
}
break;
case TAGS:
if(bmk.containsKey(b.key())) {
if(bmk.containsKey(b.key()) && bmk.get(b.key()) != null) {
this.tags.insertIndexEntry(bmk_user, bmk.get(b.key()), urlHash);
data.put(b.key(), bmk.get(b.key()));
} else {
@ -260,7 +277,7 @@ public class YMarkTables {
}
break;
case FOLDERS:
if(bmk.containsKey(b.key())) {
if(bmk.containsKey(b.key()) && bmk.get(b.key()) != null) {
this.folders.insertIndexEntry(bmk_user, bmk.get(b.key()), urlHash);
data.put(b.key(), bmk.get(b.key()));
} else {
@ -269,7 +286,7 @@ public class YMarkTables {
}
break;
default:
if(bmk.containsKey(b.key())) {
if(bmk.containsKey(b.key()) && bmk.get(b.key()) != null) {
data.put(b.key(), bmk.get(b.key()));
}
}

17
source/de/anomic/data/YMarksHTMLImporter.java
View File

@ -29,7 +29,7 @@ public class YMarksHTMLImporter extends HTMLEditorKit.ParserCallback implements
private STATE state;
private HTML.Tag prevTag;
private HashMap<String,String> bmk;
private String folder;
private StringBuilder folder;
private final InputStream input;
private final BlockingQueue<HashMap<String,String>> bookmarks;
@ -39,7 +39,8 @@ public class YMarksHTMLImporter extends HTMLEditorKit.ParserCallback implements
this.state = STATE.NOTHING;
this.prevTag = null;
this.bmk = new HashMap<String,String>();
this.folder = YMarkTables.FOLDERS_IMPORTED;
this.folder = new StringBuilder(YMarkTables.FOLDER_BUFFER_SIZE);
this.folder.append(YMarkTables.FOLDERS_IMPORTED);
this.bookmarks = new ArrayBlockingQueue<HashMap<String,String>>(queueSize);
this.input = input;
this.htmlParser = new ParserDelegator();
@ -70,12 +71,13 @@ public class YMarksHTMLImporter extends HTMLEditorKit.ParserCallback implements
break;
case BOOKMARK:
this.bmk.put(YMarkTables.BOOKMARK.TITLE.key(), new String(data));
this.bmk.put(YMarkTables.BOOKMARK.FOLDERS.key(), this.folder);
this.bmk.put(YMarkTables.BOOKMARK.FOLDERS.key(), this.folder.toString());
this.bmk.put(YMarkTables.BOOKMARK.PUBLIC.key(), YMarkTables.BOOKMARK.PUBLIC.deflt());
this.bmk.put(YMarkTables.BOOKMARK.VISITS.key(), YMarkTables.BOOKMARK.VISITS.deflt());
break;
case FOLDER:
this.folder = this.folder + YMarkTables.FOLDERS_SEPARATOR + new String(data);
this.folder.append(YMarkTables.FOLDERS_SEPARATOR);
this.folder.append(data);
break;
case FOLDER_DESC:
Log.logInfo(YMarkTables.BOOKMARKS_LOG, "YMarksHTMLImporter - folder: "+this.folder+" desc: "+new String(data));
@ -133,9 +135,10 @@ public class YMarksHTMLImporter extends HTMLEditorKit.ParserCallback implements
if (t == HTML.Tag.H3) {
state = STATE.FOLDER_DESC;
} else if (t == HTML.Tag.DL) {
if(!folder.equals(YMarkTables.FOLDERS_IMPORTED)) {
folder = folder.replaceAll(YMarkIndex.PATTERN_REPLACE, "");
}
//TODO: get rid of .toString.equals()
if(!this.folder.toString().equals(YMarkTables.FOLDERS_IMPORTED)) {
folder.setLength(folder.lastIndexOf(YMarkTables.FOLDERS_SEPARATOR));
}
} else {
state = STATE.NOTHING;
}

172
source/de/anomic/data/YMarksXBELImporter.java
View File

@ -2,6 +2,7 @@ package de.anomic.data;
import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
import java.util.HashMap;
import java.util.concurrent.ArrayBlockingQueue;
@ -19,6 +20,7 @@ import org.xml.sax.helpers.DefaultHandler;
public class YMarksXBELImporter extends DefaultHandler implements Runnable {
public static enum XBEL {
NOTHING,
XBEL,
TITLE,
DESC,
@ -34,29 +36,23 @@ public class YMarksXBELImporter extends DefaultHandler implements Runnable {
}
}
public static enum STATE {
NOTHING,
BOOKMARK,
INFO,
FOLDER,
FOLDER_DESC
}
private HashMap<String,String> bmk;
private boolean parsingValue;
private STATE state;
private String keyname;
private String folder;
private final InputStream input;
private XBEL outer_state; // BOOKMARK, FOLDER, NOTHING
private XBEL inner_state; // DESC, TITLE, INFO, ALIAS, (METADATA), NOTHING
private boolean parse_value;
private final StringBuilder buffer;
private final StringBuilder folder;
private final InputStream input;
private final ArrayBlockingQueue<HashMap<String,String>> bookmarks;
private final SAXParser saxParser;
public YMarksXBELImporter (final InputStream input, int queueSize) throws IOException {
this.buffer = new StringBuilder();
this.bmk = null;
this.folder = YMarkTables.FOLDERS_IMPORTED;
this.buffer = new StringBuilder();
this.folder = new StringBuilder(YMarkTables.FOLDER_BUFFER_SIZE);
this.folder.append(YMarkTables.FOLDERS_IMPORTED);
this.bookmarks = new ArrayBlockingQueue<HashMap<String,String>>(queueSize);
this.input = input;
final SAXParserFactory factory = SAXParserFactory.newInstance();
@ -95,47 +91,61 @@ public class YMarksXBELImporter extends DefaultHandler implements Runnable {
}
public void startElement(final String uri, final String name, String tag, final Attributes atts) throws SAXException {
if (tag == null) return;
String date;
if (tag == null) return;
tag = tag.toLowerCase();
if (XBEL.BOOKMARK.tag().equals(tag)) {
this.bmk = new HashMap<String,String>();
this.bmk.put(YMarkTables.BOOKMARK.URL.key(), atts.getValue(uri, YMarkTables.BOOKMARK.URL.xbel_attrb()));
this.bmk.put(YMarkTables.BOOKMARK.DATE_ADDED.key(), atts.getValue(uri, YMarkTables.BOOKMARK.DATE_ADDED.xbel_attrb()));
this.bmk.put(YMarkTables.BOOKMARK.DATE_VISITED.key(), atts.getValue(uri, YMarkTables.BOOKMARK.DATE_VISITED.xbel_attrb()));
this.bmk.put(YMarkTables.BOOKMARK.DATE_MODIFIED.key(), atts.getValue(uri, YMarkTables.BOOKMARK.DATE_MODIFIED.xbel_attrb()));
state = STATE.BOOKMARK;
this.parsingValue = false;
try {
date = String.valueOf(YMarkTables.parseISO8601(atts.getValue(uri, YMarkTables.BOOKMARK.DATE_ADDED.xbel_attrb())));
} catch (ParseException e) {
date = String.valueOf(System.currentTimeMillis());
}
this.bmk.put(YMarkTables.BOOKMARK.DATE_ADDED.key(), date);
try {
date = String.valueOf(YMarkTables.parseISO8601(atts.getValue(uri, YMarkTables.BOOKMARK.DATE_VISITED.xbel_attrb())));
this.bmk.put(YMarkTables.BOOKMARK.DATE_VISITED.key(), date);
} catch (ParseException e) {
}
try {
date = String.valueOf(YMarkTables.parseISO8601(atts.getValue(uri, YMarkTables.BOOKMARK.DATE_MODIFIED.xbel_attrb())));
} catch (ParseException e) {
date = String.valueOf(System.currentTimeMillis());
}
this.bmk.put(YMarkTables.BOOKMARK.DATE_MODIFIED.key(), date);
outer_state = XBEL.BOOKMARK;
inner_state = XBEL.NOTHING;
this.parse_value = false;
} else if(XBEL.FOLDER.tag().equals(tag)) {
this.state = STATE.FOLDER;
this.outer_state = XBEL.FOLDER;
this.inner_state = XBEL.NOTHING;
} else if (XBEL.DESC.tag().equals(tag)) {
if(this.state == STATE.FOLDER) {
this.keyname = null;
this.state = STATE.FOLDER_DESC;
} else if (this.state == STATE.BOOKMARK) {
this.keyname = YMarkTables.BOOKMARK.DESC.key();
} else {
Log.logInfo(YMarkTables.BOOKMARKS_LOG, "YMarksXBELImporter - state: "+this.state+" tag: "+tag);
this.parsingValue = false;
return;
}
this.parsingValue = true;
this.inner_state = XBEL.DESC;
this.parse_value = true;
} else if (XBEL.TITLE.tag().equals(tag)) {
if(this.state == STATE.FOLDER) {
this.keyname = null;
} else if (this.state == STATE.BOOKMARK) {
this.keyname = YMarkTables.BOOKMARK.TITLE.key();
} else {
Log.logInfo(YMarkTables.BOOKMARKS_LOG, "YMarksXBELImporter - state: "+this.state+" tag: "+tag);
this.parsingValue = false;
return;
}
this.parsingValue = true;
this.inner_state = XBEL.TITLE;
this.parse_value = true;
} else if (XBEL.INFO.tag().equals(tag)) {
this.parsingValue = false;
this.state = STATE.INFO;
} else {
this.parsingValue = false;
this.state = STATE.NOTHING;
this.inner_state = XBEL.INFO;
this.parse_value = false;
} else if (XBEL.METADATA.tag().equals(tag)) {
/*
this.meta_owner = atts.getValue(uri, "owner");
this.inner_state = XBEL.METADATA;
this.parse_value = true;
*/
} else if (XBEL.ALIAS.tag().equals(tag)) {
/*
this.alias_ref = atts.getValue(uri, "ref");
this.inner_state = XBEL.ALIAS;
this.parse_value = false;
*/
}
else {
this.outer_state = XBEL.NOTHING;
this.inner_state = XBEL.NOTHING;
this.parse_value = false;
}
}
@ -146,7 +156,7 @@ public class YMarksXBELImporter extends DefaultHandler implements Runnable {
if(XBEL.BOOKMARK.tag().equals(tag)) {
// write bookmark
if (!this.bmk.isEmpty()) {
this.bmk.put(YMarkTables.BOOKMARK.FOLDERS.key(), this.folder);
this.bmk.put(YMarkTables.BOOKMARK.FOLDERS.key(), this.folder.toString());
try {
this.bookmarks.put(this.bmk);
bmk = new HashMap<String,String>();
@ -154,32 +164,60 @@ public class YMarksXBELImporter extends DefaultHandler implements Runnable {
Log.logException(e);
}
}
this.state = STATE.FOLDER;
this.outer_state = XBEL.FOLDER;
} else if (XBEL.FOLDER.tag().equals(tag)) {
this.state = STATE.NOTHING;
// go up one folder
if(!folder.equals(YMarkTables.FOLDERS_IMPORTED)) {
folder = folder.replaceAll(YMarkIndex.PATTERN_REPLACE, "");
this.state = STATE.FOLDER;
}
//TODO: get rid of .toString.equals()
if(!this.folder.toString().equals(YMarkTables.FOLDERS_IMPORTED)) {
folder.setLength(folder.lastIndexOf(YMarkTables.FOLDERS_SEPARATOR));
}
this.outer_state = XBEL.FOLDER;
} else if (XBEL.INFO.tag().equals(tag)) {
this.state = STATE.BOOKMARK;
this.inner_state = XBEL.NOTHING;
} else if (XBEL.METADATA.tag().equals(tag)) {
this.inner_state = XBEL.INFO;
}
}
public void characters(final char ch[], final int start, final int length) {
if (parsingValue) {
if (parse_value) {
buffer.append(ch, start, length);
if (this.state == STATE.BOOKMARK) {
this.bmk.put(this.keyname, this.buffer.toString());
} else if (this.state == STATE.FOLDER) {
this.folder = this.folder + YMarkTables.FOLDERS_SEPARATOR + this.buffer.toString();
} else if (this.state == STATE.FOLDER_DESC) {
Log.logInfo(YMarkTables.BOOKMARKS_LOG, "YMarksXBELImporter - folder: "+this.folder+" desc: "+this.buffer.toString());
this.state = STATE.FOLDER;
}
this.buffer.setLength(0);
this.parsingValue = false;
switch(outer_state) {
case BOOKMARK:
switch(inner_state) {
case DESC:
this.bmk.put(YMarkTables.BOOKMARK.DESC.key(), this.buffer.toString());
break;
case TITLE:
this.bmk.put(YMarkTables.BOOKMARK.TITLE.key(), this.buffer.toString());
break;
case METADATA:
// this.meta_data = this.buffer.toString();
break;
default:
break;
}
break;
case FOLDER:
switch(inner_state) {
case DESC:
break;
case TITLE:
this.folder.append(YMarkTables.FOLDERS_SEPARATOR);
this.folder.append(this.buffer);
break;
case METADATA:
// this.meta_data = this.buffer.toString();
break;
default:
break;
}
break;
default:
break;
}
this.buffer.setLength(0);
this.parse_value = false;
}
}