mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
bookmarksDB / xbel.xml:
- added support for folder=/foldername - it crashes if foldername ends with / git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5207 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
parent
848dbbd280
commit
b97ff24b43
|
@ -322,8 +322,12 @@ public class bookmarksDB {
|
||||||
return indexWord.word2hash(user+":"+tagName.toLowerCase());
|
return indexWord.word2hash(user+":"+tagName.toLowerCase());
|
||||||
}
|
}
|
||||||
|
|
||||||
public Iterator<String> getFolderList(final boolean priv){
|
public Iterator<String> getFolderList(final boolean priv){
|
||||||
|
return getFolderList("/", priv);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Iterator<String> getFolderList(final String root, final boolean priv){
|
||||||
|
|
||||||
final Set<String> folders = new TreeSet<String>();
|
final Set<String> folders = new TreeSet<String>();
|
||||||
String path = "";
|
String path = "";
|
||||||
final Iterator<Tag> it = this.getTagIterator(priv);
|
final Iterator<Tag> it = this.getTagIterator(priv);
|
||||||
|
@ -331,15 +335,16 @@ public class bookmarksDB {
|
||||||
|
|
||||||
while(it.hasNext()){
|
while(it.hasNext()){
|
||||||
tag=it.next();
|
tag=it.next();
|
||||||
if (tag.getFriendlyName().startsWith("/")) {
|
if (tag.getFriendlyName().startsWith(root)) {
|
||||||
path = tag.getFriendlyName();
|
path = tag.getFriendlyName();
|
||||||
path = cleanTagsString(path);
|
path = cleanTagsString(path);
|
||||||
while(path.length() > 0){
|
while(path.length() > 0 && !path.equals(root)){
|
||||||
folders.add(path);
|
folders.add(path);
|
||||||
path = path.replaceAll("(/.[^/]*$)", ""); // create missing folders in path
|
path = path.replaceAll("(/.[^/]*$)", ""); // create missing folders in path
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!root.equals("/")) { folders.add(root); }
|
||||||
folders.add("\uffff");
|
folders.add("\uffff");
|
||||||
return folders.iterator();
|
return folders.iterator();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user