Changeset 1716

Timestamp:

Feb 15, 2014, 9:01:31 PM (11 years ago)

Author:

John Small

Message:

Ticket 501: Fixed bug and improved error handling. Errors, if any, now logged to file.

File:

• trunk/shdwmgr.cmd (modified) (4 diffs)

trunk/shdwmgr.cmd

@@ -2 +2 @@
  * $Id$
  *
- * ShdwMgr: Create Shadows for FM/2 installation */
+ * ShdwMgr: Create Shadows for FM/2 installation
+ *
+ * 14 Feb 14  JBS Ticket 501: Corrected a syntax error and improved the error handling.
+ *                            Errors are now logged to a file.
  *
  */
@@ -9 +12 @@
 call SysLoadFuncs
 
-parse upper arg package_parm .
-if strip(package_parm) == '' then
-   package_parm = 'FM2'
-else
-   if wordpos(package_parm, 'FM2 FM2UTILS') = 0 then
-      do
-         say 'Invalid parameter: 'arg(1)
-         say 'Program aborted....'
-         '@pause'
-         exit 1
-      end
-
 parse source . . thispgm
 thisdir = left(thispgm, lastpos('\', thispgm) - 1)
@@ -26 +17 @@
    thisdir = thisdir || '\'
 call directory thisdir
+parse value filespec('N', thispgm) with program_stem '.' .
+
+parse upper arg package_parm .
+if strip(package_parm) == '' then
+   package_parm = 'FM2'
+pkgnum = wordpos(package_parm, 'FM2 FM2UTILS')
+
+error_log = program_stem || pkgnum || '.err'
+call SysFileDelete error_log              /* Delete previous error logs for this package */
+errors = 0
+
+if pkgnum = 0 then
+   do
+      call lineout error_log, 'Invalid parameter:' package_parm
+      call lineout error_log, 'Program aborted....'
+      exit 1
+   end
 
 i = 0
@@ -61 +69 @@
          if fullfilename = '' then
             do
-               say 'Unable to find file: 'Shadow.i.filename
-               say 'thisdir: 'thisdir
-               '@pause'
-               exit 1
+               call lineout error_log, 'Unable to find file: 'Shadow.i.filename
+               errors = errors + 1
             end
-         lenbytes = X2C( D2X( LENGTH( Shadow.i.longname ), 4 ))
-         rc = SysPutEA( fullfilename, '.LONGNAME', X2C('FDFF') || REVERSE( lenbytes ) || Shadow.i.longname )
-         if rc \= 0 then
+         else
             do
-               say 'Error in setting .LONGNAME EA: 'rc
-               say 'Exiting...'
-               '@pause'
-               exit 2
-            end
-         p = lastpos('\', Shadow.i.filename)
-         if p > 0 then
-            shadowidname = substr(Shadow.i.filename, p + 1)
-         else
-            shadowidname = Shadow.i.filename
-         rc = SysCreateObject( 'WPShadow', Shadow.i.longname, Shadow.i.folderid , 'SHADOWID='fullfilename';OBJECTID=<FM3_Shadow_'shadowidname'>;', 'R')
-         if rc \= 1 then
-            do
-               say 'Unable to create shadow object for :'Shadow.i.filename
-               say 'Exiting...'
-               '@pause'
-               exit 3
+               lenbytes = X2C( D2X( LENGTH( Shadow.i.longname ), 4 ))
+               rc = SysPutEA( fullfilename, '.LONGNAME', X2C('FDFF') || REVERSE( lenbytes ) || Shadow.i.longname )
+               if rc \= 0 then
+                  do
+                     call lineout error_log, 'Error in setting .LONGNAME EA: 'rc
+                     errors = errors + 1
+                  end
+
+               p = lastpos('\', Shadow.i.filename)
+               if p > 0 then
+                  shadowidname = substr(Shadow.i.filename, p + 1)
+               else
+                  shadowidname = Shadow.i.filename
+               rc = SysCreateObject( 'WPShadow', Shadow.i.longname, Shadow.i.folderid , 'SHADOWID='fullfilename';OBJECTID=<FM3_Shadow_'shadowidname'>;', 'R')
+               if rc \= 1 then
+                  do
+                     call lineout error_log, 'Unable to create shadow object for :'Shadow.i.filename
+                     errors = errors + 1
+                  end
             end
       end
 end
+if errors > 0 then
+   do
+      call lineout error_log, errors 'errors encountered.'
+      call stream error_log, 'c', 'close'
+   end