Changeset 269

Timestamp:

08/27/07 11:46:41 (17 years ago)

Author:

pinsard

Message:

add revision in report message. see 65.

Location:

trunk/SRC/Utilities

Files:

• createfunc.pro (modified) (2 diffs)
• createpro.pro (modified) (2 diffs)
• report.pro (modified) (1 diff)

trunk/SRC/Utilities/createfunc.pro

@@ -26 +26 @@
 ;
 ; @examples
-; IDL> print, createfunc('3*2', filename='test')
-; IDL> print, createfunc('3*two', filename = 'test' $
-; IDL>                          , kwdlist ='two = two', two = 2)
+; IDL> print, createfunc('3*2', FILENAMEIN='test')
+; IDL> print, createfunc('3*two', FILENAMEIN='test' $
+; IDL>                          , KWDLIST='two = two', TWO=2)
 ;
 ; @history
@@ -44 +44 @@
   compile_opt idl2, hidden, strictarrsubs
 ;
-  IF n_elements(command) NE 1 THEN stop
+  usage="result=createfunc(command, FILENAMEIN=filenamein , KWDLIST=kwdlist, _EXTRA=ex)"
+;
+  IF n_elements(command) NE 1 THEN BEGIN
+    dummy = report(['Input parameter command empty', $
+                    'Usage : ' + usage])
+    stop
+  ENDIF
 ; define filename if needed
   if NOT keyword_set(filenamein) then filename = 'for_createfunc.pro' $

trunk/SRC/Utilities/createpro.pro

@@ -29 +29 @@
 ;
 ; @examples
-; IDL> createpro, ['print,''OK'''], filename='test'
+; IDL> createpro, ['print,''OK'''], FILENAMEIN='test'
 ; IDL> createpro, ['if keyword_set(ok) then print,''OK'' else print, ''No'''] $
-; IDL>   , filename = 'test', kwdlist =', ok = ok'
+; IDL>   , FILENAMEIN='test', KWDLIST =', ok = ok'
 ; IDL> createpro, ['if keyword_set(ok) then print,''OK'' else print, ''No'''] $
-; IDL>   , filename = 'test', kwdlist = ', ok = ok', /ok
+; IDL>   , FILENAMEIN='test', KWDLIST= ', ok = ok', /ok
 ;
 ; @history
@@ -52 +52 @@
   IF keyword_set(kwdused) THEN BEGIN
     dummy = report(['keyword KWDUSED has been suppressed,' $
-                    , 'please pass directly your keywords through _extra,' $
+                    , 'please pass directly your keywords through _EXTRA,' $
                     , 'see examples in createpro header'])
     return

trunk/SRC/Utilities/report.pro

@@ -99 +99 @@
 ; If we do not ask any question, we just make a print
   IF NOT keyword_set(question) THEN BEGIN
-    IF keyword_set(simple) THEN prefix = '' ELSE prefix = '% '+routine_name(1)+': '
-    if n_elements(text) GT 1 THEN $
+    IF keyword_set(simple) THEN prefix = '' ELSE BEGIN
+;    Look for the revsion in the code of the procedure/function calling this 
+;    report function (ie the one where an problem was detected) in the first
+;    occurence of the form :
+;    "; $Id$"
+     split=STRSPLIT(routine_name(1), ' ', /EXTRACT)  
+     fileroutine=split[1]
+     coderoutine = getfile(fileroutine)
+     idline = where(stregex(coderoutine,'^; \$Id: .* .* .* .* \$', /boolean) EQ 1, cnt1)
+     IF (idline GT 0) THEN BEGIN
+       split=STRSPLIT(coderoutine[idline],' ', /EXTRACT)
+       revision=split[3]
+       prefix = '% '+routine_name(1)+ ' ' + revision + ': '
+     ENDIF ELSE BEGIN
+       prefix = '% '+routine_name(1)+': '
+     ENDELSE
+    ENDELSE
+    IF n_elements(text) GT 1 THEN $
       for i = 0, n_elements(text)-2 do print, prefix+text[i]
-    print, prefix+text[n_elements(text)-1]
-  ENDIF
+      print, prefix+text[n_elements(text)-1]
+    ENDIF
 
    return,  res