Changeset 025a6ef in tol

Timestamp:

Feb 24, 2012, 8:43:47 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

6eef720

Parents:

9750667

Message:

refs #1438, se corrije un error con las referencias a archivos incluidos

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4185 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tolbase/lib/toltk/tolinspe.tcl (modified) (6 diffs)

tolbase/lib/toltk/tolinspe.tcl

@@ -703 +703 @@
     NameBlock -
     Set {
-      #puts "HTItem, ref = '$ref' '$args'"
+      puts "HTItem, ref = '$ref' '$args'"
       # args[5] is the index of the set object
       # args[6] is the flag file
@@ -808 +808 @@
       set data [lreplace $data 9 9 $objRef]  
       #(pgea) se utiliza la informacon de instancia
+      puts "Tol_ClassOfFromReference $objRef"
       set classOf [Tol_ClassOfFromReference $objRef]
+      puts "Tol_InstanceContentFromReference $objRef"
       set insCont [Tol_InstanceContentFromReference $objRef]
       if {$insCont ne ""} {
@@ -1378 +1380 @@
   variable node_prefix ""
   variable data
+  variable knownReference ""
 
   set index [$ht_tree index anchor]
@@ -1488 +1491 @@
   variable item_id 1
   variable w_tabset
-    
+  variable knownReference ""
+
   ClearHiertables
   $w_tabset tab configure Variables -text [mc Files]
@@ -1494 +1498 @@
   $w_tabset select 0
   foreach f [lreverse [::tol::info included]] {
-    set fi [::tol::info included $f]
+    # this catch is needed because info include could return files not
+    # realy included.
+    if { [ catch { ::tol::info included $f } fi ] } continue
     # tener en cuenta el subtype cuando lo retorne
+    set knownReference [ list "File" $f ] 
     InsertChild Set $f \
-        [lindex $fi 0] [lindex $fi 1] [list [lindex $fi 2]] $item_id 1 [lindex $fi 3] [lindex $fi 4]
+        [lindex $fi 0] [lindex $fi 1] [list [lindex $fi 2]] $item_id 1 [lindex $fi 3] [lindex $fi 4] 
   }
 }
@@ -2029 +2036 @@
 
 proc Tol_StructOfFromReference { objReference } {
+  if { [ llength $objReference ] == 2 && 
+       [ lindex $objReference 0 ] eq "File" } {
+    return ""
+  }
   set addr [ ::tol::info address $objReference ]
   return [ Tol_StructOf $addr ]