diff --git a/htroot/ViewFile.html b/htroot/ViewFile.html index 46fd69a9a..e1026877b 100644 --- a/htroot/ViewFile.html +++ b/htroot/ViewFile.html @@ -19,7 +19,7 @@
View URL Content
URL:
#[url]#
-
Hash:
#[hash]#
+
Hash:
#[hash]#
Word Count:
#[wordCount]#
Description:
#[desc]#
Size:
#[size]# Bytes
#(mimeTypeAvailable)#:: diff --git a/htroot/api/yacydoc.xml b/htroot/api/yacydoc.xml index c4bfe4fe8..7a93b3aad 100644 --- a/htroot/api/yacydoc.xml +++ b/htroot/api/yacydoc.xml @@ -7,18 +7,18 @@ you can validate it with http://www.stg.brown.edu/service/xmlvalid/ --> - #[dc_title]# - #[dc_creator]# - #[dc_contributor]# - #[dc_subject]# - #[dc_description]# - #[dc_publisher]# - #[dc_date]# - yacy:doctype:#[dc_type]# - yacy:urlhash:#[dc_identifier]# - #[dc_publisher]# - #[yacy_size]# - #[dc_language]# + #[dc_title]# + #[dc_creator]# + #[dc_contributor]# + #[dc_subject]# + #[dc_description]# + #[dc_publisher]# + #[dc_date]# + yacy:doctype:#[dc_type]# + yacy:urlhash:#[dc_identifier]# + #[dc_publisher]# + #[yacy_size]# + #[dc_language]# #[yacy_loaddate]# yacy:urlhash:#[yacy_referrer_hash]# #[yacy_referrer_url]# diff --git a/source/de/anomic/document/parser/pdfParser.java b/source/de/anomic/document/parser/pdfParser.java index e5dd5b089..f77ed9751 100644 --- a/source/de/anomic/document/parser/pdfParser.java +++ b/source/de/anomic/document/parser/pdfParser.java @@ -50,6 +50,7 @@ import de.anomic.document.Document; import de.anomic.kelondro.util.FileUtils; import de.anomic.server.serverCharBuffer; import de.anomic.yacy.yacyURL; +import de.anomic.yacy.logging.Log; public class pdfParser extends AbstractParser implements Idiom { @@ -134,8 +135,11 @@ public class pdfParser extends AbstractParser implements Idiom { } else { writer = new serverCharBuffer(); } - - stripper.writeText(theDocument, writer ); + try { + stripper.writeText(theDocument, writer ); // may throw a NPE + } catch (Exception e) { + Log.logWarning("pdfParser", e.getMessage()); + } theDocument.close(); theDocument = null; writer.close(); diff --git a/source/de/anomic/document/parser/vsdParser.java b/source/de/anomic/document/parser/vsdParser.java index 331f0152a..cdc1ab037 100644 --- a/source/de/anomic/document/parser/vsdParser.java +++ b/source/de/anomic/document/parser/vsdParser.java @@ -39,6 +39,8 @@ import de.anomic.yacy.yacyURL; import org.apache.poi.hdgf.extractor.VisioTextExtractor; import org.apache.poi.hpsf.SummaryInformation; +import de.anomic.yacy.logging.Log; + public class vsdParser extends AbstractParser implements Idiom { /** @@ -91,7 +93,7 @@ public class vsdParser extends AbstractParser implements Idiom { contents = extractor.getText(); summary = extractor.getSummaryInformation(); } catch (Exception e) { - e.printStackTrace(); + Log.logWarning("vsdParser", e.getMessage()); } String author = null; diff --git a/source/de/anomic/kelondro/text/DocumentIndex.java b/source/de/anomic/kelondro/text/DocumentIndex.java index 631546a91..d8ede7b45 100644 --- a/source/de/anomic/kelondro/text/DocumentIndex.java +++ b/source/de/anomic/kelondro/text/DocumentIndex.java @@ -124,7 +124,7 @@ public class DocumentIndex extends Segment { */ public void addAll(File start) { assert (start != null); - assert (start.canRead()); + assert (start.canRead()) : start.toString(); if (!start.isDirectory()) { try { this.queue.put(start); @@ -192,7 +192,7 @@ public class DocumentIndex extends Segment { * @return a list of files that contain the word */ public ArrayList find(String querystring) { - return find(querystring, 0, 20); + return find(querystring, 0, 100); } /** diff --git a/source/de/anomic/kelondro/text/Segment.java b/source/de/anomic/kelondro/text/Segment.java index 7aefb8bca..5354da2eb 100644 --- a/source/de/anomic/kelondro/text/Segment.java +++ b/source/de/anomic/kelondro/text/Segment.java @@ -188,8 +188,6 @@ public class Segment { wordCount++; } - - return wordCount; } diff --git a/source/migration.java b/source/migration.java index bbb6cf31a..5cbaacdb6 100644 --- a/source/migration.java +++ b/source/migration.java @@ -78,17 +78,23 @@ public class migration { if(file.exists()) delete(file); } + + /* + * copy skins from the release to DATA/SKINS. + */ public static void installSkins(final Switchboard sb){ final File skinsPath = sb.getConfigPath("skinPath", "DATA/SKINS"); final File defaultSkinsPath = new File(sb.getRootPath(), "skins"); - if(defaultSkinsPath.exists()){ + if (defaultSkinsPath.exists()) { final List skinFiles = listManager.getDirListing(defaultSkinsPath.getAbsolutePath()); mkdirs(skinsPath); - for(String skinFile : skinFiles){ - if(skinFile.endsWith(".css")){ - try{ - FileUtils.copy(new File(defaultSkinsPath, skinFile), new File(skinsPath, skinFile)); - }catch(final IOException e){} + for (String skinFile : skinFiles){ + if (skinFile.endsWith(".css")){ + File from = new File(defaultSkinsPath, skinFile); + File to = new File(skinsPath, skinFile); + if (from.lastModified() > to.lastModified()) try { + FileUtils.copy(from, to); + } catch (final IOException e) {} } } }