Merge lp:~jontai/openvista-gtm-integration/bug440743 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

review: Approve

=== modified file 'docs/man1/ovimport.1'
--- docs/man1/ovimport.1	2009-07-09 23:48:40 +0000
+++ docs/man1/ovimport.1	2009-12-01 00:20:24 +0000
@@ -2,7 +2,9 @@
 .SH NAME
 ovimport \- imports routines and globals into a new OpenVista instance
 .SH SYNOPSIS
-.B ovimport [-h] [-V] [-q] [-f] [-r 
+.B ovimport [-h] [-V] [-q] [-f] [-c 
+.I imported|all|none
+.B ] [-r 
 .I routines
 .B ] [-g 
 .I globals
@@ -34,8 +36,13 @@
 flag is given, although imported routines and globals will overwrite any
 routines or globals with the same name.
 .PP
-Routines are compiled after the routines are imported.  Journaling is
-temporarily disabled during the global import to improve performance, unless the 
+Routines are compiled after the routines are imported.  By default, only
+imported routines are compiled.  You should use 
+.B -c all 
+if you want to recompile all routines or 
+.B -c none 
+if you do not want to compile any routines.  Journaling is temporarily disabled
+during the global import to improve performance, unless the 
 .B -f
 flag was given.  This is safe to do because the database is guaranteed to be
 empty before the import, so even if the system crashes and the database is
@@ -59,14 +66,16 @@
 display help text and exit
 .IP -V
 display version information and exit
-.IP -y
-do not ask for confirmation
 .IP -q
 quiet; suppress status messages
-.IP -j
-after restoring the backup, apply journal entries
 .IP -f
-force; kill any processes accessing the database before restore
+force; import routines and globals even if target instance is not empty
+.IP -c
+compile imported routines only (the default), all routines, or no routines
+.IP -r
+path to routine export file, archive, or directory
+.IP -g
+path to global export file or archive
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'scripts/etc/bash_completion.d/openvista'
--- scripts/etc/bash_completion.d/openvista	2009-04-23 23:17:19 +0000
+++ scripts/etc/bash_completion.d/openvista	2009-12-01 00:20:24 +0000
@@ -134,10 +134,10 @@
 
 complete -F _ovinstanceadd ovinstanceadd
 
-# ovimport [-h] [-V] [-q] [-f] [-r] ROUTINES [-g] GLOBALS INSTANCE_NAME
+# ovimport [-h] [-V] [-q] [-f] [-c imported|all|none] [-r] ROUTINES [-g] GLOBALS INSTANCE_NAME
 _ovimport()
 {
-    opts='-h -V -q -f -r -g'
+    opts='-h -V -q -f -c -r -g'
     allowed_nonopt_words=1
 
     COMPREPLY=()
@@ -157,7 +157,7 @@
 		    # afterward; use a hack to exit on the next iteration of
 		    # the loop
                     allowed_nonopt_words=0
-                elif [ x"${COMP_WORDS[i]}" = x"-r" ] || [ x"${COMP_WORDS[i]}" = x"-g" ]; then
+                elif [ x"${COMP_WORDS[i]}" = x"-c" ] || [ x"${COMP_WORDS[i]}" = x"-r" ] || [ x"${COMP_WORDS[i]}" = x"-g" ]; then
                     allowed_nonopt_words=`expr $allowed_nonopt_words + 1`
                 fi
                 ;;

=== modified file 'scripts/usr/bin/ovimport'
--- scripts/usr/bin/ovimport	2009-10-31 06:23:59 +0000
+++ scripts/usr/bin/ovimport	2009-12-01 00:20:24 +0000
@@ -25,16 +25,17 @@
 . /usr/lib/openvista/functions
 
 # parse arguments
-while getopts hVqfr:g: option; do
+while getopts hVqfc:r:g: option; do
     case $option in
         h)
             cat <<EOF
-Usage: ovimport [-q] [-f] [-r ROUTINES] [-g GLOBALS] INSTANCE_NAME
+Usage: ovimport [-q] [-f] [-c imported|all|none] [-r ROUTINES] [-g GLOBALS] INSTANCE_NAME
    or  ovimport -h
    or  ovimport -V
 
   -q  quiet; suppress status messages
   -f  force; import routines and globals even if target instance is not empty
+  -c  compile imported routines only (the default), all routines, or no routines
   -r  path to routine export file, archive, or directory
   -g  path to global export file or archive
   -h  display this help text and exit
@@ -58,6 +59,9 @@
         f)
             force=true
             ;;
+        c)
+            compile=$OPTARG
+            ;;
         r)
             routines=$OPTARG
             ;;
@@ -82,7 +86,7 @@
 
 # check permissions
 in_groups || {
-    echo "ovimport: permission denied" >&2 
+    echo "ovimport: permission denied" >&2
     exit 1
 }
 
@@ -111,9 +115,9 @@
     }
 fi
 
-tempdir=`mktemp -d -p "$root/$instance/tmp" .ovimport.XXXXXXXXXX` || 
+tempdir=`mktemp -d -p "$root/$instance/tmp" .ovimport.XXXXXXXXXX` ||
 exit_with_error "ovimport" "Unable to create temporary directory"
-        
+
 # the EXIT handler may or may not run if we're interrupted or killed depending
 # on the shell used (from what I've read, it does run on bash, but not on
 # dash); use $exit to exit with the correct status in both cases
@@ -190,7 +194,7 @@
             real_routines=`cd "$dirname"; pwd`/"$basename"
 
             # redirect output to a temporary file because we need to both log
-            # the output and inspect it to determine success 
+            # the output and inspect it to determine success
             (
                 umask 007
                 mumps -run ^%RI > "$tempdir/ovimport.ri" 2>&1 <<EOF
@@ -206,13 +210,15 @@
 
             grep '^Restored [0-9]\{1,\} lines in [0-9]\{1,\} routines' "$tempdir/ovimport.ri" > /dev/null ||
             exit_with_error "ovimport" "Unable to import routines"
+
+            awk '{ if ($0 ~ /^Restored [0-9]+ lines in [0-9]+ routines/) { capture = 0 } if (capture == 1 && NF != 0) { print $0 } if ($0 ~ /^Output directory/) { capture = 1 } }' "$tempdir/ovimport.ri" > "$tempdir/ovimport.compile"
             ;;
         M)
             print_status "ovimport" "Copying routines" "$skip_status"
 
             (
                 umask 007
-                rsync -rl --exclude '.*/' --include '*/' --include '*.m' --exclude '*' "$real_routines/" "$root/$instance/routines/"
+                rsync -rl --exclude '.*/' --include '*/' --include '*.m' --exclude '*' --out-format='%n' "$real_routines/" "$root/$instance/routines/" > "$tempdir/ovimport.compile"
             ) || exit_with_error "ovimport" "Unable to import routines"
 
             # the umask is not enough to guarantee that the routines are user
@@ -225,13 +231,31 @@
             ;;
     esac
 
-    print_status "ovimport" "Compiling routines" "$skip_status"
-
-    (
-        umask 007
-        cd "$root/$instance/objects" &&
-        find "$root/$instance/routines/" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
-    ) || exit_with_error "ovimport" "Unable to compile routines"
+    case $compile in
+        all)
+            print_status "ovimport" "Compiling all routines" "$skip_status"
+
+            (
+                umask 007
+                cd "$root/$instance/objects" &&
+                find "$root/$instance/routines/" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
+            ) || exit_with_error "ovimport" "Unable to compile routines"
+            ;;
+        none)
+            print_status "ovimport" "Skipping routine compilation" "$skip_status"
+            ;;
+        *)
+            print_status "ovimport" "Compiling imported routines" "$skip_status"
+
+            (
+                umask 007
+                cd "$root/$instance/objects" &&
+                for routine in `cat "$tempdir/ovimport.compile" | sed 's/\.m//g'`; do
+                    mumps "../routines/$routine.m" 2> /dev/null
+                done
+            )
+            ;;
+    esac
 
     print_status "ovimport" "Finished loading $routines into $instance" "$skip_status"
 fi