Changeset 277

Timestamp:

09/04/07 14:30:58 (17 years ago)

Author:

smasson

Message:

slight bugfix + nicer print in report, see #65

File:

• trunk/SRC/Utilities/report.pro (modified) (5 diffs)

trunk/SRC/Utilities/report.pro

@@ -6 +6 @@
 ; To ask a question whose answer is not yes/no, use <pro>xquestion</pro>.
 ;
-; @param TEXT {in}{required} {type=scalar string or arrays of string}
-; If TEXT is a scalar string, we look for the line feed character "!C".
-; If TEXT is set to an array of strings, each
+; @param TEXTIN {in}{required} {type=scalar string or arrays of string}
+; If TEXTIN is a scalar string, we look for the line feed character "!C".
+; If TEXTIN is set to an array of strings, each
 ; array element is displayed as a separate line of text.
 ;
@@ -61 +61 @@
 ;-
 ;
-FUNCTION report, text, DEFAULT_NO = default_no, PARENT = parent, QUESTION = question, SIMPLE = simple, _EXTRA = ex
+FUNCTION report, textin, DEFAULT_NO = default_no, PARENT = parent, QUESTION = question, SIMPLE = simple, _EXTRA = ex
 ;
   compile_opt idl2, strictarrsubs
@@ -67 +67 @@
   res = -1                      ;
 ; we separate the text in different lines (separated by !C) if it is not already done...
-  if n_elements(text) EQ 1 then text = str_sep(text, '!C', /trim)
+  if n_elements(textin) EQ 1 then text = '% ' + str_sep(textin, '!C', /trim) ELSE text = '% ' + textin
+; we get the line, routine name ad revision version
+  IF NOT keyword_set(simple) THEN 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$"
+    prefix = routine_name(1)
+    split = STRSPLIT(prefix, ' ', /EXTRACT)  
+    coderoutine = getfile(split[1])
+    idline = (where(stregex(coderoutine, '^; \$Id: .* .* .* .* \$', /boolean) EQ 1))[0]
+    IF (idline GT 0) THEN BEGIN
+      split = STRSPLIT(coderoutine[idline], ' ', /EXTRACT)
+      prefix = '% '+prefix+ ' rev. ' + split[3] + ': '
+    ENDIF ELSE BEGIN
+      prefix = '% '+prefix+': '
+    ENDELSE
+    text = [prefix, text]
+  ENDIF
 ; there is some widgets activated, it is easy, we call dialog_massage
   if (widget_info(/managed))[0] NE 0 then BEGIN
@@ -76 +94 @@
 ; there is not any widget activated
 ; do we ask a question ?
-    if keyword_set(question) then BEGIN
+    IF keyword_set(question) THEN BEGIN
 ; what is the answer by default ?
       if keyword_set(default_no) then answer = 'n' ELSE answer = 'y'
       default_answer = answer
       if n_elements(text) GT 1 THEN $
-        for i = 0, n_elements(text)-2 do print, text[i]
+         for i = 0, n_elements(text)-2 do print, text[i]
       read, text[n_elements(text)-1]+' y/n (default answer is '+default_answer+')', answer
       answer = strlowcase(answer) ;
@@ -99 +117 @@
 ; 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 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
+    FOR i = 0, n_elements(text)-1 do print, text[i]
+  ENDIF
 
-   return,  res
+  return,  res
 end