Changeset 741 for trunk

Timestamp:

02/17/11 11:12:56 (15 months ago)

Author:

mgalloy

Message:

Fixes related to ticket #72. Handles the case where overview comments for a directory are not in the directory file. It crashed before, but now uses the first line of the normal comments, if present.

Files:

• trunk/src/tree/doctreedirectory__define.pro (modified) (5 diffs)

trunk/src/tree/doctreedirectory__define.pro

@@ -118 +118 @@
           return, self.system->processComments(self.overviewComments)
         endif
-        
+
+        if (obj_valid(self.comments)) then begin
+          firstLineTree = mg_tm_firstline(self.comments)
+          comments = self.system->processComments(firstLineTree)
+          obj_destroy, firstLineTree
+          return, comments
+        endif
+                
         return, ''
       end
@@ -125 +132 @@
           return, self.system->processComments(self.systemOverviewComments)
         endif
-        
+
+        if (obj_valid(self.systemComments)) then begin
+          firstLineTree = mg_tm_firstline(self.systemComments)
+          comments = self.system->processComments(firstLineTree)
+          obj_destroy, firstLineTree
+          return, comments
+        endif
+                
         return, ''
       end      
@@ -371 +385 @@
   compile_opt strictarr
   
-  doctree_fill_links, self.comments, self  
-  
-  self.systemOverviewComments = self.overviewComments->_clone()
-  doctree_fill_links, self.overviewComments, self
-  doctree_fill_links, self.systemOverviewComments, self.system
- 
+  if (obj_isa(self.overviewComments, 'MGtmNode')) then begin
+    self.systemOverviewComments = self.overviewComments->_clone()
+    doctree_fill_links, self.overviewComments, self
+    doctree_fill_links, self.systemOverviewComments, self.system
+  endif else begin
+    if (obj_isa(self.comments, 'MGtmNode')) then begin
+      self.systemComments = self.comments->_clone()
+      doctree_fill_links, self.systemComments, self.system
+    endif    
+  endelse
+  
+  doctree_fill_links, self.comments, self
+  
   proFiles = self.proFiles->get(/all, count=nproFiles)
   for i = 0L, nproFiles - 1L do (proFiles[i])->fillLinks
@@ -450 +471 @@
   compile_opt strictarr, hidden
   
-  obj_destroy, [self.overviewComments, self.systemOverviewComments, self.comments]
+  obj_destroy, [self.overviewComments, self.systemOverviewComments]
+  obj_destroy, [self.systemComments, self.comments]
   obj_destroy, [self.author, self.copyright, self.history]
   obj_destroy, [self.proFiles, self.dlmFiles, self.savFiles, self.idldocFiles]
@@ -563 +585 @@
              systemOverviewComments: obj_new(), $
              comments: obj_new(), $
+             systemComments: obj_new(), $
              
              proFiles: obj_new(), $