Changeset 100 for nutchez-0.1/bin

Timestamp:

Jul 10, 2009, 2:53:11 PM (16 years ago)

Author:

waue

Message:

0.3 v

fix some bug

Location:

nutchez-0.1/bin

Files:

• nutch (modified) (2 diffs)
• nutchez (modified) (3 diffs)
• nutchez-func.sh (modified) (4 diffs)

nutchez-0.1/bin/nutch

@@ -12 +12 @@
 #   NUTCH_OPTS      Extra Java runtime options.
 #
+
+NUTCH_HOME=/opt/nutchez/nutch
+NUTCH_CONF_DIR=~/.nutchez/conf
+NUTCH_LOG_DIR=~/.nutchez/log
+
 cygwin=false
 case "`uname`" in
@@ -77 +82 @@
 
 # some directories
-THIS_DIR=`dirname "$THIS"`
-NUTCH_HOME=`cd "$THIS_DIR/.." ; pwd`
+
+
 
 # some Java parameters

nutchez-0.1/bin/nutchez

@@ -11 +11 @@
 
   export JAVA_HOME=/usr/lib/jvm/java-6-sun
-  export NUTCH_HOME=/opt/nutch
+  export NUTCH_HOME=/opt/nutchez/nutch
   export NUTCH_CONF_DIR=~/.nutchez/conf
   export NUTCH_LOG_DIR=~/.nutchez/log
 
-. /opt/nutch/bin/nutchez-func.sh
+. /opt/nutchez/nutch/bin/nutchez-func.sh
 
 init_nutchez
@@ -146 +146 @@
     #else
     1)
+      clean_tempfile
       exit
       ;;
@@ -157 +158 @@
       ;;
     255)
+      clean_tempfile
       echo_dialog_v "ESC pressed !!"
       ;;

nutchez-0.1/bin/nutchez-func.sh

@@ -49 +49 @@
 promote_tempfile () {
   echo_dialog_v "7. chang tmp as txt"
-  rm ~/.nutchez/sav/n.*.txt
+  rm -f ~/.nutchez/sav/n.*.txt
   mv /tmp/n.urls.tmp ~/.nutchez/sav/n.urls.txt
   mv /tmp/n.robot.tmp ~/.nutchez/sav/n.robot.txt
   mv /tmp/n.crawler.tmp ~/.nutchez/sav/n.crawler.txt
   mv /tmp/n.tomcat.tmp ~/.nutchez/sav/n.tomcat.txt
+  rm -f /tmp/n.*.tmp
 }
 
 clean_tempfile () {
   echo_dialog_v "7. delete tmp"
-  rm /tmp/n.*.tmp
+  rm -f /tmp/n.*.tmp
 }
 
@@ -93 +94 @@
   if ! [ -e ~/.nutchez/tomcat ] ;then
     # isntall tomcat to home
-    cp -rf /opt/nutch/tomcat ~/.nutchez/
+    cp -rf /opt/nutchez/tomcat ~/.nutchez/
     chown -R $LOGNAME:$LOGNAME ~/.nutchez/tomcat/
     # make search dir
@@ -185 +186 @@
         --yesno "$MSG" 26 51
   RET=$?
-  echo_dialog_v "final return = $RET"
+  echo_dialog_v "final return = $RET"  
   return $RET
 }
@@ -202 +203 @@
   setup_nutchez
   install_tomcat
-  echo_dialog_v "/opt/nutch/bin/nutch crawl ~/.nutchez/urls -dir ~/.nutchez/search -depth $DEPTH"
+  echo_dialog_v "/opt/nutchez/nutch/bin/nutch crawl ~/.nutchez/urls -dir ~/.nutchez/search -depth $DEPTH"
   echo_dialog_v "nutch conf dir = $NUTCH_CONF_DIR"
-  /opt/nutch/bin/nutch crawl ~/.nutchez/urls -dir ~/.nutchez/search -depth $DEPTH -topN 5000 -threads 1000
+  /opt/nutchez/nutch/bin/nutch crawl ~/.nutchez/urls -dir ~/.nutchez/search -depth $DEPTH -topN 5000 -threads 1000
 }
 
 start_tomcat () {
   echo_dialog_v "8. start_tomcat "
-  echo_dialog_v "/opt/nutch/tomcat/bin/startup.sh"
+  echo_dialog_v "/opt/nutchez/nutch/tomcat/bin/startup.sh"
   if [ -e /tmp/search ];then
     rm -rf /tmp/search