INTEGRATION: CWS hc680postbeta (1.2.2); FILE MERGED

2005/01/18 09:15:10 fpe 1.2.2.1: Updated helper files

1 files changed, 12 insertions, 4 deletions

diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index d2d3022170..3fa3538178 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -28,8 +28,6 @@ $params = join "|", "",@ARGV,"";
 # Update localizations from sdf
 #-------------------------------
 # read all strings with id "tit" from all localize.sdf files
-&read_loctit;
-&read_loctree;
 
 if ($langdir eq '***ALL***') {
     if (opendir AUX, "$treeroot") {
@@ -42,10 +40,19 @@ if ($langdir eq '***ALL***') {
     @langs = $langdir;
 }
 
+if (@langs[0] ne "en-US") {
+    &read_loctit;
+    &read_loctree;
+}
+
 for $l(@langs) {
-    &do_lang($l);
+    if ($l ne "en-US") {
+        &do_lang($l);
+    }
 }
 
+
+
 $t1 = new Benchmark;
 $td = timediff($t1, $t0);
 print timestr($td),"\n";
@@ -238,6 +245,7 @@ sub processtreefiles {
                     if (defined($helpsection{$id})) {
                         $l =~ s/title="(.*)"/title="$helpsection{$id}"/;
                     } else {
+                        print "#";
                         $l =~ s/title="(.*)"/title="NOTFOUND:$id"/;
                     }
                 } else {
@@ -248,7 +256,7 @@ sub processtreefiles {
             }
       }
   
-        $tvout = "$treeroot/$lng/$tv";
+    $tvout = "$treeroot/$lng/$tv";
       if (open TV, ">$tvout") {
         for $line(@lines) { 
                 $line =~ s/\$\[officename\]/%PRODUCTNAME/g;