Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

build.xml

@@ -256,7 +256,7 @@
     <jar destfile="${lib}/yacycore.jar" basedir="${build}/">
       <manifest>
         <attribute name="Main-Class" value="net.yacy.yacy"/>
-        <attribute name="Class-Path" value="../htroot ${manifest.classpath}"/>
+        <attribute name="Class-Path" value="${manifest.classpath}"/>
       </manifest>
     </jar>
 

htroot/js/yacyinteractive.js

@@ -204,6 +204,7 @@ function resultLine(type, item, linenumber) {
   if (title == "") title = path;
   if (title.length >= 60) title = title.substring(0, 28) + "..." + title.substring(title.length - 29);
   pd = item.pubDate;
+  if (pd == undefined) pd = "";
   if (pd.substring(pd.length - 6) == " +0000") pd = pd.substring(0, pd.length - 6);
   if (pd.substring(pd.length - 9) == " 00:00:00") pd = pd.substring(0, pd.length - 9);
   if (pd.substring(pd.length - 5) == " 2010") pd = pd.substring(0, pd.length - 5);

startYACY.bat

@@ -5,11 +5,8 @@ REM setting startup type for proper restart
 if not exist DATA md DATA
 echo . >DATA\yacy.noconsole
 
-If %1.==CPGEN. GoTo :CPGEN
-
-Rem Generating the proper classpath unsing loops and labels
-Set CLASSPATH=htroot
-For %%X in (lib/*.jar) Do Call %0 CPGEN lib\%%X
+Rem Setting the classpath
+Set CLASSPATH=lib\yacycore.jar;htroot
 
 REM Please change the "javastart" settings in the web-interface "Basic Configuration" -> "Advanced" 
 set jmx=
@@ -65,9 +62,5 @@ if defined priolvl (
 
 GoTo :STARTJAVA
 
-Rem This target is used to concatenate the classpath parts 
-:CPGEN
-Set CLASSPATH=%CLASSPATH%;%2
-
 Rem Target needed to jump to the end of the file
 :END

stopYACY.bat

@@ -1,21 +1,10 @@
 @Echo Off
 title YaCy
-If %1.==CPGEN. GoTo :CPGEN
 
-Rem Generating the proper classpath unsing loops and labels
-Set CLASSPATH=classes;htroot
-For %%X in (lib/*.jar) Do Call %0 CPGEN lib\%%X
-For %%X in (libx/*.jar) Do Call %0 CPGEN libx\%%X
+Rem Setting the classpath
+Set CLASSPATH=classes;lib\yacycore.jar;htroot
 
 Rem Stopping yacy
 Echo Generated Classpath:%CLASSPATH%
 java -classpath %CLASSPATH% net.yacy.yacy -shutdown
 
-GoTo :END
-
-Rem This target is used to concatenate the classpath parts 
-:CPGEN
-Set CLASSPATH=%CLASSPATH%;%2
-
-Rem Target needed to jump to the end of the file
-:END