From 375d49d53667b3aeb8efc8eb9af7085058080796 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Wed, 3 Feb 2016 21:50:50 +0100
Subject: [PATCH 1/4] upd classpath in batches (remove not necessary htroot)
 see prev commit

---
 installYaCyWindowsService.bat | 2 +-
 startYACY.bat                 | 2 +-
 stopYACY.bat                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/installYaCyWindowsService.bat b/installYaCyWindowsService.bat
index d91c9599d..a9248510d 100644
--- a/installYaCyWindowsService.bat
+++ b/installYaCyWindowsService.bat
@@ -26,7 +26,7 @@ Echo JRE Parameters:%javacmd%
 Echo Startpath %~dp0
 
 REM Install YaCy as Windows Service
-%exepath%\prunsrv.exe //IS//YaCy --Jvm=auto --StartMode=jvm --StartClass=net.yacy.yacy --Classpath=htroot;lib/yacycore.jar --StartPath=%~dp0 --JvmOptions=%javaopts% --Startup=auto --JvmMx=%jmx% --JvmMs=%jms% --StopMode=jvm --StopClass=net.yacy.yacy --StopParams=-shutdown --Description=%servicedesc%
+%exepath%\prunsrv.exe //IS//YaCy --Jvm=auto --StartMode=jvm --StartClass=net.yacy.yacy --Classpath=lib/yacycore.jar --StartPath=%~dp0 --JvmOptions=%javaopts% --Startup=auto --JvmMx=%jmx% --JvmMs=%jms% --StopMode=jvm --StopClass=net.yacy.yacy --StopParams=-shutdown --Description=%servicedesc%
 
 if not errorlevel 1 goto installed
 Echo Failed installing YaCy service
diff --git a/startYACY.bat b/startYACY.bat
index eaef4c6da..776acccc0 100644
--- a/startYACY.bat
+++ b/startYACY.bat
@@ -6,7 +6,7 @@ if not exist DATA md DATA
 echo . >DATA\yacy.noconsole
 
 Rem Setting the classpath
-Set CLASSPATH=lib\yacycore.jar;htroot
+Set CLASSPATH=lib\yacycore.jar
 
 REM Please change the "javastart" settings in the web-interface "Basic Configuration" -> "Advanced" 
 set jmx=
diff --git a/stopYACY.bat b/stopYACY.bat
index f692a37a0..d1f7228e4 100644
--- a/stopYACY.bat
+++ b/stopYACY.bat
@@ -2,7 +2,7 @@
 title YaCy
 
 Rem Setting the classpath
-Set CLASSPATH=lib\yacycore.jar;htroot
+Set CLASSPATH=lib\yacycore.jar
 
 Rem Stopping yacy
 Echo Generated Classpath:%CLASSPATH%

From cc79ad8de69efd800a646e653d94f46863a2018f Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Thu, 4 Feb 2016 00:47:42 +0100
Subject: [PATCH 2/4] compare search page, remove diminished search target
 (romso.de, dbpedia.neofonie.de )

---
 htroot/compare_yacy.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htroot/compare_yacy.java b/htroot/compare_yacy.java
index 89ba69098..427c55424 100644
--- a/htroot/compare_yacy.java
+++ b/htroot/compare_yacy.java
@@ -48,11 +48,11 @@ public class compare_yacy {
         searchengines.put("metager2.de (web)", "http://www.metager2.de/search.php?ses=web&q=");
         searchengines.put("metager2.de (international)", "http://www.metager2.de/search.php?ses=international&q=");
         searchengines.put("yahoo.com", "http://search.yahoo.com/search?p=");
-        searchengines.put("romso.de", "http://romso.de/?q=");
+        //searchengines.put("romso.de", "http://romso.de/?q="); // no serach service 2016-01-02
         searchengines.put("Wikipedia English", "http://en.wikipedia.org/wiki/");
         searchengines.put("Wikipedia Deutsch", "http://de.wikipedia.org/wiki/");
         searchengines.put("Sciencenet", "http://sciencenet.fzk.de:8080/yacysearch.html?verify=true&resource=global&nav=all&display=2&meanCount=5&query=");
-        searchengines.put("dbpedia", "http://dbpedia.neofonie.de/browse/~:");
+        //searchengines.put("dbpedia", "http://dbpedia.neofonie.de/browse/~:"); // no search service 2016-01-02
         searchengines.put("wolfram alpha", "http://www.wolframalpha.com/input/?i=");
         searchengines.put("OAIster@OCLC", "http://oaister.worldcat.org/search?q=");
         searchengines.put("oai.yacy.net", "http://oai.yacy.net/yacysearch.html?verify=true&resource=local&nav=all&display=2&meanCount=5&query=");

From 535d4bf75f4c458938f0ccad53a4d0ea50c23e50 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Thu, 4 Feb 2016 19:16:00 +0100
Subject: [PATCH 3/4] respect hidden attribute for file and smb directory
 listing (hidden directories are not listed, effects crawling of local file
 system)

---
 .../cora/document/id/MultiProtocolURL.java    | 11 ++++++--
 .../net/yacy/search/index/DocumentIndex.java  | 28 ++++++++++---------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/source/net/yacy/cora/document/id/MultiProtocolURL.java b/source/net/yacy/cora/document/id/MultiProtocolURL.java
index 24907b8d3..755f60f1a 100644
--- a/source/net/yacy/cora/document/id/MultiProtocolURL.java
+++ b/source/net/yacy/cora/document/id/MultiProtocolURL.java
@@ -2256,9 +2256,16 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
         return null;
     }
 
+    /**
+     * Get directory listing of file or smb url
+     * respects the hidden attribute of a directory (return null if hidden)
+     * 
+     * @return names of files and directories or null
+     * @throws IOException
+     */
     public String[] list() throws IOException {
-        if (isFile()) return getFSFile().list();
-        if (isSMB()) try {
+        if (isFile() && !isHidden()) return getFSFile().list();
+        if (isSMB() && !isHidden()) try {
             final SmbFile sf = getSmbFile();
             if (!sf.isDirectory()) return null;
             try {
diff --git a/source/net/yacy/search/index/DocumentIndex.java b/source/net/yacy/search/index/DocumentIndex.java
index aa805c4b7..7512393a3 100644
--- a/source/net/yacy/search/index/DocumentIndex.java
+++ b/source/net/yacy/search/index/DocumentIndex.java
@@ -204,22 +204,24 @@ public class DocumentIndex extends Segment {
             return;
         }
         final String[] s = start.list();
-        AnchorURL w;
-        for ( final String t : s ) {
-            try {
-                w = new AnchorURL(start, t);
-                if ( w.canRead() && !w.isHidden() ) {
-                    if ( w.isDirectory() ) {
-                        addConcurrent(w);
-                    } else {
-                        try {
-                            this.queue.put(w);
-                        } catch (final InterruptedException e ) {
+        if (s != null) {
+            AnchorURL w;
+            for ( final String t : s ) {
+                try {
+                    w = new AnchorURL(start, t);
+                    if ( w.canRead() && !w.isHidden() ) {
+                        if ( w.isDirectory() ) {
+                            addConcurrent(w);
+                        } else {
+                            try {
+                                this.queue.put(w);
+                            } catch (final InterruptedException e ) {
+                            }
                         }
                     }
+                } catch (final MalformedURLException e1 ) {
+                    ConcurrentLog.logException(e1);
                 }
-            } catch (final MalformedURLException e1 ) {
-                ConcurrentLog.logException(e1);
             }
         }
     }

From 937fbb0b9fbd1ae2fca202319ffc32d8870d4648 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Thu, 4 Feb 2016 19:20:27 +0100
Subject: [PATCH 4/4] correct isHidden() for smb from last commit

---
 source/net/yacy/cora/document/id/MultiProtocolURL.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/net/yacy/cora/document/id/MultiProtocolURL.java b/source/net/yacy/cora/document/id/MultiProtocolURL.java
index 755f60f1a..1d786dbcf 100644
--- a/source/net/yacy/cora/document/id/MultiProtocolURL.java
+++ b/source/net/yacy/cora/document/id/MultiProtocolURL.java
@@ -2265,9 +2265,9 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
      */
     public String[] list() throws IOException {
         if (isFile() && !isHidden()) return getFSFile().list();
-        if (isSMB() && !isHidden()) try {
+        if (isSMB()) try {
             final SmbFile sf = getSmbFile();
-            if (!sf.isDirectory()) return null;
+            if (!sf.isDirectory() || sf.isHidden()) return null;
             try {
                 return TimeoutRequest.list(sf, SMB_TIMEOUT);
             } catch (final SmbException e) {