From ff19fcdb28ad88986354c7ff8cde5bd2a42fd534 Mon Sep 17 00:00:00 2001 From: apfelmaennchen Date: Tue, 6 Dec 2011 23:17:57 +0000 Subject: [PATCH] bugfix for YMarks XBEL import and export; thanks to Dominic git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@8138 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/YMarks.html | 98 ++++++++++++++----- htroot/api/ymarks/get_xbel.java | 2 +- source/de/anomic/data/ymark/YMarkEntry.java | 2 +- .../anomic/data/ymark/YMarkXBELImporter.java | 4 + 4 files changed, 80 insertions(+), 26 deletions(-) diff --git a/htroot/YMarks.html b/htroot/YMarks.html index 757b8de9a..45d83d13e 100644 --- a/htroot/YMarks.html +++ b/htroot/YMarks.html @@ -143,14 +143,40 @@ To see a list of all APIs, please visit the

Bookmark Importerhelp

- Netscape HTML
- Firefox JSON
- XBEL
- Surrogate XML
- DMOZ XML
- YaCy White/Black List
- YaCy old bookmarks.db (admin)
- YaCy Crawl Starts (admin)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Netscape HTML
Firefox JSON
XBEL
Surrogate XML
DMOZ XML
YaCy White/Black List
YaCy bookmarks.db (admin)
YaCy Crawl Starts (admin)

Bookmark file @@ -169,26 +195,50 @@ To see a list of all APIs, please visit the

- Off -
- Only for empty tags -
- Overwriting existing tags -
- Merging with existing tags + + + + + + + + + + + + + + + + + +
Off
Only for empty tags
Overwriting existing tags
Merging with existing tags

Automatic Indexinghelp

- No indexing -
- Index every bookmark entry -
- Index every bookmark entry plus all directly linked pages -
- Index all domains from all bookmarks completely -

- also all media (image/movie/document) links + + + + + + + + + + + + + + + + + + + + + +
No indexing
Index every bookmark entry
Index every bookmark entry plus all directly linked pages
Index all domains from all bookmarks completely

include all media (image/movie/document) links

diff --git a/htroot/api/ymarks/get_xbel.java b/htroot/api/ymarks/get_xbel.java index 59a3d9f5c..35d7ef4c4 100644 --- a/htroot/api/ymarks/get_xbel.java +++ b/htroot/api/ymarks/get_xbel.java @@ -131,7 +131,7 @@ public class get_xbel { buffer.append(CharacterCoding.unicode2xml(date.toISO8601(), true)); buffer.append(YMarkEntry.BOOKMARK.TAGS.xbel()); - buffer.append(bmk_row.get(YMarkEntry.BOOKMARK.TAGS.key(), YMarkEntry.BOOKMARK.TAGS.deflt())); + buffer.append(CharacterCoding.unicode2xml(bmk_row.get(YMarkEntry.BOOKMARK.TAGS.key(), YMarkEntry.BOOKMARK.TAGS.deflt()),true)); buffer.append(YMarkEntry.BOOKMARK.PUBLIC.xbel()); buffer.append(bmk_row.get(YMarkEntry.BOOKMARK.PUBLIC.key(), YMarkEntry.BOOKMARK.PUBLIC.deflt())); diff --git a/source/de/anomic/data/ymark/YMarkEntry.java b/source/de/anomic/data/ymark/YMarkEntry.java index 551d24f32..bd73bc800 100644 --- a/source/de/anomic/data/ymark/YMarkEntry.java +++ b/source/de/anomic/data/ymark/YMarkEntry.java @@ -25,7 +25,7 @@ public class YMarkEntry extends TreeMap { DATE_ADDED ("date_added", "", "", "add_date", "added", "dateAdded", "date"), DATE_MODIFIED ("date_modified", "", "", "last_modified", "modified", "lastModified", "date"), DATE_VISITED ("date_visited", "", "", "last_visited", "visited", "", "date"), - PUBLIC ("public", "", "flase", "private", "yacy:public", "", "lock"), + PUBLIC ("public", "", "false", "private", "yacy:public", "", "lock"), TAGS ("tags", "dc:subject", "unsorted", "shortcuturl", "yacy:tags", "keyword", "tag"), VISITS ("visits", "", "0", "", "yacy:visits", "", "stat"), FOLDERS ("folders", "", "/unsorted", "", "", "", "folder"); diff --git a/source/de/anomic/data/ymark/YMarkXBELImporter.java b/source/de/anomic/data/ymark/YMarkXBELImporter.java index 93a6db765..bebb29ace 100644 --- a/source/de/anomic/data/ymark/YMarkXBELImporter.java +++ b/source/de/anomic/data/ymark/YMarkXBELImporter.java @@ -161,6 +161,10 @@ public class YMarkXBELImporter extends DefaultHandler implements Runnable { if (XBEL.BOOKMARK.tag().equals(tag)) { this.bmk = new YMarkEntry(); this.bmk.put(YMarkEntry.BOOKMARK.URL.key(), atts.getValue(uri, YMarkEntry.BOOKMARK.URL.xbel_attrb())); + //TODO: include a dynamic loop over all annotation tags + this.bmk.put(YMarkEntry.BOOKMARK.TAGS.key(), atts.getValue(uri, YMarkEntry.BOOKMARK.TAGS.xbel_attrb())); + this.bmk.put(YMarkEntry.BOOKMARK.PUBLIC.key(), atts.getValue(uri, YMarkEntry.BOOKMARK.PUBLIC.xbel_attrb())); + this.bmk.put(YMarkEntry.BOOKMARK.VISITS.key(), atts.getValue(uri, YMarkEntry.BOOKMARK.VISITS.xbel_attrb())); try { date.parseISO8601(atts.getValue(uri, YMarkEntry.BOOKMARK.DATE_ADDED.xbel_attrb())); } catch (ParseException e) {