Changeset 25767 for documentation/trunk

Timestamp:

2012-06-06T16:22:23+12:00 (12 years ago)

Author:

ak19

Message:

Processing of the MajorVersion element is moved into a separate preprocessing pass, in order to ensure that NumberedItems nested in a MajorVersion element continue to have the right numbering on display.

Location:

documentation/trunk/tutorials

Files:

• generate-html.sh (modified) (4 diffs)
• processing/preprocess-tut-xml.xsl (added)

documentation/trunk/tutorials/generate-html.sh

@@ -19 +19 @@
 processing_dir=`pwd`/processing
 output_dir=`pwd`/html
+tmp_dir=`pwd`/tmp
 
 export CLASSPATH=$shared_dir:$GSDLHOME/gli:$GSDLHOME/gli/classes:$GSDLHOME/perllib:$shared_dir/xalan.jar
@@ -26 +27 @@
 fi
 
+if [ ! -d $tmp_dir ]; then
+    mkdir $tmp_dir
+fi
+
 langs="en fr es ru"
 
@@ -31 +36 @@
 # is on the difference between $@ and $* and when to add quotes around them
 
+# preprocess-tut-xml.xsl removes all the non-matching MajorVersion tags first
+# This needs to be done in a separate pass, to ensure NumberedItems nested in 
+# MajorVersion tags preserve their numbering.
+
 echo "processing top level index"
-java -DGSDLHOME=$GSDLHOME ApplyXSLT "en" $processing_dir/xml-to-top-index.xsl  $source_dir/tutorial_en.xml "$@" > $output_dir/index.html
+java -DGSDLHOME=$GSDLHOME ApplyXSLT "en" $processing_dir/preprocess-tut-xml.xsl  $source_dir/tutorial_en.xml "$@" > $tmp_dir/tutorial_en.xml
+java -DGSDLHOME=$GSDLHOME ApplyXSLT "en" $processing_dir/xml-to-top-index.xsl  $tmp_dir/tutorial_en.xml "$@" > $output_dir/index.html
 
 echo "generating wiki index page"
-java -DGSDLHOME=$GSDLHOME ApplyXSLT "en" $processing_dir/xml-to-wiki-index.xsl $source_dir/tutorial_en.xml "$@" > $output_dir/wiki-index.txt
+java -DGSDLHOME=$GSDLHOME ApplyXSLT "en" $processing_dir/xml-to-wiki-index.xsl $tmp_dir/tutorial_en.xml "$@" > $output_dir/wiki-index.txt
 
 for l in $langs; do
@@ -43 +53 @@
     fi
     cd $output_dir/$l
-    java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-index.xsl $source_dir/tutorial_$l.xml "$@" > index.html
-    java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-one-html.xsl $source_dir/tutorial_$l.xml "$@" > all_tutorials.html
-    java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-many-html.xsl $source_dir/tutorial_$l.xml "$@" | perl -S $GSDLHOME/gli/help/splithelpdocument.pl
+
+    if [ "$l" != "en" ]; then
+    java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/preprocess-tut-xml.xsl $source_dir/tutorial_$l.xml "$@" > $tmp_dir/tutorial_$l.xml
+    fi
+    java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-index.xsl $tmp_dir/tutorial_$l.xml "$@" > index.html
+    java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-one-html.xsl $tmp_dir/tutorial_$l.xml "$@" > all_tutorials.html
+    java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-many-html.xsl $tmp_dir/tutorial_$l.xml "$@" | perl -S $GSDLHOME/gli/help/splithelpdocument.pl
     cd $top_dir
 done
 
-
-
+# get rid of intermediary directory
+rm -rf $tmp_dir