- shifted main classes to new package net.yacy

- fixed some bugs in last commit

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6427 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/crawler/CrawlProfile.java

@@ -55,6 +55,7 @@ public class CrawlProfile {
     private final File profileTableFile;
     
     public CrawlProfile(final File file) throws IOException {
+        //System.out.println("loading crawl profile from " + file);
         this.profileTableFile = file;
         profileTableFile.getParentFile().mkdirs();
         final Heap dyn = new Heap(profileTableFile, Word.commonHashLength, NaturalOrder.naturalOrder, 1024 * 64);
@@ -63,6 +64,7 @@ public class CrawlProfile {
         entry e;
         while (pi.hasNext()) {
         	e = pi.next();
+        	if (e == null) continue;
         	Log.logInfo("CrawlProfiles", "loaded Profile " + e.handle() + ": " + e.name());
         }
     }

source/de/anomic/search/Switchboard.java

@@ -1696,6 +1696,14 @@ public final class Switchboard extends serverSwitch {
         }
     }
     
+    public indexingQueueEntry webStructureAnalysis(final indexingQueueEntry in) {
+        in.queueEntry.updateStatus(Response.QUEUE_STATE_STRUCTUREANALYSIS);
+        final Integer[] ioLinks = webStructure.generateCitationReference(in.document, in.condenser, in.queueEntry.lastModified()); // [outlinksSame, outlinksOther]
+        in.document.setInboundLinks(ioLinks[0].intValue());
+        in.document.setOutboundLinks(ioLinks[1].intValue());
+        return in;
+    }
+    
     public void storeDocumentIndex(final indexingQueueEntry in) {
         in.queueEntry.updateStatus(Response.QUEUE_STATE_INDEXSTORAGE);
         storeDocumentIndex(in.process, in.queueEntry, in.document, in.condenser);

source/net/yacy/dbtest.java

@@ -1,3 +1,4 @@
+package net.yacy;
 // test application
 // shall be used to compare the kelondroDB with other databases
 // with relevance to yacy-specific use cases

source/net/yacy/document/Document.java

@@ -133,7 +133,15 @@ public class Document {
             final CachedFileOutputStream text, final Map<DigestURI, String> anchors, final HashMap<String, ImageEntry> images) {
         this(location, mimeType, charset, languages, keywords, title, author, sections, abstrct, (Object)text, anchors, images);
     }
-
+    
+    public void setInboundLinks(int il) {
+        this.inboundLinks = il;
+    }
+    
+    public void setOutboundLinks(int ol) {
+        this.outboundLinks = ol;
+    }
+    
     /**
      * compute a set of languages that this document contains
      * the language is not computed using a statistical analysis of the content, only from given metadata that came with the document

source/net/yacy/genpw.java

@@ -1,3 +1,4 @@
+package net.yacy;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

source/net/yacy/migration.java

@@ -1,3 +1,4 @@
+package net.yacy;
 // migration.java
 // -----------------------
 // (C) by Alexander Schier

source/net/yacy/screenshot.java

@@ -1,3 +1,4 @@
+package net.yacy;
 
 import java.awt.Dimension;
 import java.awt.Rectangle;

source/net/yacy/yacy.java

@@ -1,3 +1,4 @@
+package net.yacy;
 // yacy.java
 // -----------------------
 // (C) by Michael Peter Christen; mc@yacy.net
@@ -22,6 +23,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;

startYACY.bat

@@ -33,7 +33,7 @@ Echo.
 Echo You can download Java at http://java.com/
 Echo.
 Echo ***************************************************************************
-start %priority% javaw %javacmd% -classpath %CLASSPATH% yacy
+start %priority% javaw %javacmd% -classpath %CLASSPATH% net.yacy.yacy
 Echo You can close the console safely now.
 
 GoTo :END

startYACY.sh

@@ -171,7 +171,7 @@ CLASSPATH=""
 for N in lib/*.jar; do CLASSPATH="$CLASSPATH$N:"; done
 CLASSPATH=".:htroot:$CLASSPATH"
 
-cmdline="$JAVA $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy";
+cmdline="$JAVA $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH net.yacy.yacy";
 if [ $DEBUG -eq 1 ] #debug
 then
 	cmdline=$cmdline

startYACY_Win9x.bat

@@ -9,7 +9,7 @@ For %%X in (libx\*.jar) Do Call %0 CPGEN %%X
 
 Rem Starting yacy
 Echo Generated Classpath:%CLASSPATH%
-java -classpath %CLASSPATH% yacy
+java -classpath %CLASSPATH% net.yacy.yacy
 
 GoTo :END
 

startYACY_debug.bat

@@ -38,7 +38,7 @@ Echo  ^>^> YaCy started as daemon process. Administration at http://localhost:%p
 
 title YaCy - http://localhost:%port%
 
-start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% yacy
+start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% net.yacy.yacy
 
 if not exist DATA\yacy.restart GoTo :END
 del DATA\yacy.restart

startYACY_noconsole_Win9x.bat

@@ -8,7 +8,7 @@ For %%X in (libx\*.jar) Do Call %0 CPGEN %%X
 
 Rem Starting yacy
 Echo Generated Classpath:%CLASSPATH%
-javaw -classpath %CLASSPATH% yacy
+javaw -classpath %CLASSPATH% net.yacy.yacy
 Echo You can close the console safely
 
 GoTo :END

stopYACY.bat

@@ -9,7 +9,7 @@ For %%X in (libx/*.jar) Do Call %0 CPGEN libx\%%X
 
 Rem Stopping yacy
 Echo Generated Classpath:%CLASSPATH%
-java -classpath %CLASSPATH% yacy -shutdown
+java -classpath %CLASSPATH% net.yacy.yacy -shutdown
 
 GoTo :END
 

stopYACY.command

@@ -5,7 +5,7 @@ CLASSPATH=""
 for N in `ls -1 lib/*.jar`; do CLASSPATH="$CLASSPATH$N:"; done	
 for N in `ls -1 libx/*.jar`; do CLASSPATH="$CLASSPATH$N:"; done
 
-java -classpath classes:htroot:$CLASSPATH yacy -shutdown
+java -classpath classes:htroot:$CLASSPATH net.yacy.yacy -shutdown
 
 echo "Please wait until the YaCy daemon process terminates."
 echo "You can monitor this with 'tail -f DATA/LOG/yacy00.log' and 'fuser log/yacy00.log'"

stopYACY.sh

@@ -17,7 +17,7 @@ then
 	for N in lib/*.jar; do CLASSPATH="$CLASSPATH$N:"; done	
 	for N in libx/*.jar; do CLASSPATH="$CLASSPATH$N:"; done
 
-	java -classpath classes:htroot:$CLASSPATH yacy -shutdown
+	java -classpath classes:htroot:$CLASSPATH net.yacy.yacy -shutdown
 
 	echo "Please wait until the YaCy daemon process terminates"
 	echo "You can monitor this with 'tail -f DATA/LOG/yacy00.log' and 'fuser log/yacy00.log'"

stopYACY_Win9x.bat

@@ -8,7 +8,7 @@ For %%X in (libx\*.jar) Do Call %0 CPGEN %%X
 
 Rem Starting yacy
 Echo Generated Classpath:%CLASSPATH%
-java -classpath %CLASSPATH% yacy -shutdown
+java -classpath %CLASSPATH% net.yacy.yacy -shutdown
 
 GoTo :END