boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

*) hopefully fixing NPE issue introduced in r6797

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6808 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
low012 15 years ago
parent 55d8e686ea
commit fc43f3028e
2 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File

4
source/de/anomic/data/BookmarkDate.java
Unescape View File

@ -63,7 +63,7 @@ public class BookmarkDate {
} }
// rebuilds the datesDB from the bookmarksDB // rebuilds the datesDB from the bookmarksDB
public void init(Iterator<Bookmark> it) { public void init(final Iterator<Bookmark> it) {
Log.logInfo("BOOKMARKS", "start init dates.db from bookmarks.db..."); Log.logInfo("BOOKMARKS", "start init dates.db from bookmarks.db...");
//final Iterator<Bookmark> it=bookmarkIterator(true); //final Iterator<Bookmark> it=bookmarkIterator(true);
Bookmark bookmark; Bookmark bookmark;
@ -72,7 +72,7 @@ public class BookmarkDate {
int count = 0; int count = 0;
while (it.hasNext()) { while (it.hasNext()) {
bookmark=it.next(); bookmark=it.next();
if (bookmark == null) continue; // if (bookmark == null) continue;
date = String.valueOf(bookmark.getTimeStamp()); date = String.valueOf(bookmark.getTimeStamp());
bmDate=getDate(date); bmDate=getDate(date);
if(bmDate==null){ if(bmDate==null){

86
source/de/anomic/data/bookmarksDB.java
Unescape View File

@ -49,7 +49,6 @@ import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.order.NaturalOrder;
import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.DateFormatter;
import net.yacy.kelondro.util.kelondroException;
import net.yacy.kelondro.workflow.BusyThread; import net.yacy.kelondro.workflow.BusyThread;
import net.yacy.kelondro.workflow.InstantBusyThread; import net.yacy.kelondro.workflow.InstantBusyThread;
@ -102,7 +101,7 @@ public class bookmarksDB {
String[] tagArray; String[] tagArray;
while(it.hasNext()){ while(it.hasNext()){
bookmark = it.next(); bookmark = it.next();
if (bookmark == null) continue; // if (bookmark == null) continue;
tagArray = BookmarkHelper.cleanTagsString(bookmark.getTagsString() + bookmark.getFoldersString()).split(","); tagArray = BookmarkHelper.cleanTagsString(bookmark.getTagsString() + bookmark.getFoldersString()).split(",");
tag = null; tag = null;
for (final String element : tagArray) { for (final String element : tagArray) {
@ -374,7 +373,7 @@ public class bookmarksDB {
Bookmark bm; Bookmark bm;
while(it.hasNext()){ while(it.hasNext()){
bm=it.next(); bm=it.next();
if (bm == null) continue; // if (bm == null) continue;
if(priv || bm.getPublic()){ if(priv || bm.getPublic()){
set.add(bm.getUrlHash()); set.add(bm.getUrlHash());
} }
@ -391,16 +390,16 @@ public class bookmarksDB {
hashes=getTag(tagHash).getUrlHashes(); hashes=getTag(tagHash).getUrlHashes();
} }
if(priv){ if(priv){
set.addAll(hashes); set.addAll(hashes);
}else{ }else{
final Iterator<String> it=hashes.iterator(); final Iterator<String> it=hashes.iterator();
Bookmark bm; Bookmark bm;
while(it.hasNext()){ while(it.hasNext()){
bm = getBookmark(it.next()); bm = getBookmark(it.next());
if (bm != null && bm.getPublic()) { if (bm != null && bm.getPublic()) {
set.add(bm.getUrlHash()); set.add(bm.getUrlHash());
} }
} }
} }
return set.iterator(); return set.iterator();
} }
@ -448,11 +447,11 @@ public class bookmarksDB {
final Iterator<Tag> it = this.tags.values().iterator(); final Iterator<Tag> it = this.tags.values().iterator();
Tag tag; Tag tag;
while (it.hasNext()) { while (it.hasNext()) {
tag=it.next(); tag=it.next();
if (tag == null) continue; if (tag == null) continue;
if (priv ||tag.hasPublicItems()) { if (priv ||tag.hasPublicItems()) {
set.add(tag); set.add(tag);
} }
} }
return set.iterator(); return set.iterator();
} }
@ -464,8 +463,8 @@ public class bookmarksDB {
final TreeSet<Tag> set=new TreeSet<Tag>((comp == SORT_SIZE) ? tagSizeComparator : tagComparator); final TreeSet<Tag> set=new TreeSet<Tag>((comp == SORT_SIZE) ? tagSizeComparator : tagComparator);
int count = 0; int count = 0;
while (it.hasNext() && count<=max) { while (it.hasNext() && count<=max) {
set.add(it.next()); set.add(it.next());
count++; count++;
} }
return set.iterator(); return set.iterator();
} }
@ -478,28 +477,28 @@ public class bookmarksDB {
Tag tag; Tag tag;
Set<String> tagSet; Set<String> tagSet;
while(bit.hasNext()){ while(bit.hasNext()){
bm=getBookmark(bit.next()); bm=getBookmark(bit.next());
tagSet = bm.getTags(); tagSet = bm.getTags();
it = tagSet.iterator(); it = tagSet.iterator();
while (it.hasNext()) { while (it.hasNext()) {
tag=getTag(BookmarkHelper.tagHash(it.next()) ); tag=getTag(BookmarkHelper.tagHash(it.next()) );
if(priv ||tag.hasPublicItems()){ if((priv ||tag.hasPublicItems()) && tag != null){
set.add(tag); set.add(tag);
} }
} }
} }
return set.iterator(); return set.iterator();
} }
public Iterator<Tag> getTagIterator(final String tagName, final boolean priv, final int comp, final int max) { public Iterator<Tag> getTagIterator(final String tagName, final boolean priv, final int comp, final int max) {
if (max==SHOW_ALL) return getTagIterator(priv, comp); if (max==SHOW_ALL) return getTagIterator(priv, comp);
final Iterator<Tag> it = getTagIterator(tagName, priv, SORT_SIZE); final Iterator<Tag> it = getTagIterator(tagName, priv, SORT_SIZE);
final TreeSet<Tag> set=new TreeSet<Tag>((comp == SORT_SIZE) ? tagSizeComparator : tagComparator); final TreeSet<Tag> set=new TreeSet<Tag>((comp == SORT_SIZE) ? tagSizeComparator : tagComparator);
int count = 0; int count = 0;
while (it.hasNext() && count<=max) { while (it.hasNext() && count<=max) {
set.add(it.next()); set.add(it.next());
count++; count++;
} }
return set.iterator(); return set.iterator();
} }
@ -534,9 +533,9 @@ public class bookmarksDB {
Bookmark bookmark; Bookmark bookmark;
for (final String urlHash : getTag(BookmarkHelper.tagHash(selectTag)).getUrlHashes()) { // looping through all bookmarks which were tagged with selectTag for (final String urlHash : getTag(BookmarkHelper.tagHash(selectTag)).getUrlHashes()) { // looping through all bookmarks which were tagged with selectTag
bookmark = getBookmark(urlHash); bookmark = getBookmark(urlHash);
bookmark.addTag(newTag); bookmark.addTag(newTag);
saveBookmark(bookmark); saveBookmark(bookmark);
} }
} }
@ -865,22 +864,11 @@ public class bookmarksDB {
} }
public boolean hasNext() { public boolean hasNext() {
try { return this.bookmarkIter.hasNext();
return this.bookmarkIter.hasNext();
} catch (final kelondroException e) {
Log.logException(e);
return false;
}
} }
public Bookmark next() { public Bookmark next() {
try { return getBookmark(new String(this.bookmarkIter.next()));
String s = new String(this.bookmarkIter.next());
return getBookmark(s);
} catch (final kelondroException e) {
Log.logException(e);
return null;
}
} }
public void remove() { public void remove() {

Write Preview
Loading…
Cancel
Save