Add 2.0 convert to tools.

Update uograding 1.6

diff --git a/1.6/admin/Upgrading-Evergreen_1.6.xml b/1.6/admin/Upgrading-Evergreen_1.6.xml
index 3bc0d19..6494607 100644 (file)
--- a/1.6/admin/Upgrading-Evergreen_1.6.xml
+++ b/1.6/admin/Upgrading-Evergreen_1.6.xml
@@ -2,10 +2,10 @@
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude"\r
        xmlns:xl="http://www.w3.org/1999/xlink" version="5.0" xml:id="upgradingevergreen">\r
        <info>\r
-               <title>Upgrading Evergreen from 1.4 to 1.6.2</title>\r
+               <title>Upgrading Evergreen to 1.6.1</title>\r
                <abstract>\r
                        <para>This Chapter will explain the step-by-step process of upgrading <application>Evergreen\r
-                       </application> from version 1.4 to 1.6.2, including steps to upgrade <application>OpenSRF</application>. Before \r
+                       </application> to 1.6.1, including steps to upgrade <application>OpenSRF</application>. Before \r
                        upgrading, it is important to carefully plan an upgrade strategy to minimize system downtime and \r
                        service interruptions. All of the steps in this chapter are to be completed from the command line.</para>\r
                </abstract>\r
@@ -20,7 +20,7 @@
                <command>su - opensrf</command>. Once you have become a non-root user, to become the <systemitem class="username">root</systemitem> user again simply issue the exit command.</para> \r
                <para>In the following instructions, <filename class='directory'>/path/to/OpenSRF/</filename> represents the path to the OpenSRF source directory.</para>\r
        <section xml:id="upgradingevergreen-stop_evergreen">\r
-               <title>Stop Evergreen and back up data.</title>\r
+               <title>Backing Up Data</title>\r
                <procedure>\r
                        <step>\r
                                <para>As <systemitem class="username">root</systemitem>, stop the <application>Apache</application> \r
@@ -47,10 +47,10 @@
                <procedure>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract the source files for <application>OpenSRF</application> \r
-                               1.4:</para>\r
+                               1.6:</para>\r
 <screen><userinput>\r
 wget http://open-ils.org/downloads/OpenSRF-1.6.2.tar.gz\r
-tar xzf OpenSRF-1.4.0.tar.gz\r
+tar xzf OpenSRF-1.6.2.tar.gz\r
 </userinput></screen>\r
                                <para>A new directory OpenSRF-1.6.2 is created.</para>\r
                                <note><para>For the latest edition of OpenSRF, check the Evergreen download page at \r
@@ -115,7 +115,7 @@ make -f src/extras/Makefile.install [distribution]
                                you want to include support for Python<indexterm><primary>Python</primary></indexterm> and Java\r
                                <indexterm><primary>Java</primary></indexterm>, respectively.</note>\r
 <screen><userinput>\r
-cd /home/opensrf/OpenSRF-1.4.0\r
+cd /home/opensrf/OpenSRF-1.6.2\r
 ./configure --prefix=/openils --sysconfdir=/openils/conf\r
 make\r
 </userinput></screen>          \r
@@ -157,22 +157,22 @@ srfsh#
                        </step> \r
                </procedure>    \r
        </section>\r
-       <section xml:id="upgradingevergreen-upgrading_from_1.4_to_1.6.2">\r
-               <title>Upgrade <application>Evergreen</application> from 1.4 to 1.6.2</title>\r
+       <section xml:id="upgradingevergreen-upgrading_from_1.4_to_1.6.1">\r
+               <title>Upgrade <application>Evergreen</application> from 1.4 to 1.6.1</title>\r
                <procedure>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract <application>Evergreen 1.6.2.0</application>\r
                                </para>\r
 <screen><userinput>\r
-wget http://open-ils.org/downloads/Evergreen-ILS-1.6.2.0.tar.gz\r
-tar xzf Evergreen-ILS-1.6.2.0.tar.gz\r
+wget http://open-ils.org/downloads/Evergreen-ILS-1.6.1.5.tar.gz\r
+tar xzf Evergreen-ILS-1.6.1.5.tar.gz\r
 </userinput></screen>\r
                                <note><para>For the latest edition of Evergreen check the Evergreen download page at\r
                                <ulink url="http://www.open-ils.org/downloads.php" /> and adjust upgrading instructions accordingly.</para></note>\r
                        </step>\r
                        <step>\r
                                <para>As the <systemitem class="username">root</systemitem> user, install the prerequisites:</para> \r
-                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.2.0</userinput></screen>  \r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.1.5</userinput></screen>  \r
                                <para>On the next command, replace <option>[distribution]</option> with one of \r
                                these values for your distribution of Debian or Ubuntu:</para>\r
                                <itemizedlist>\r
@@ -205,19 +205,19 @@ tar xzf Evergreen-ILS-1.6.2.0.tar.gz
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, configure and compile \r
                                <application>Evergreen</application>:</para>\r
-                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.2.0</userinput></screen>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.1.5</userinput></screen>\r
                                <screen><userinput>./configure --prefix=/openils --sysconfdir=/openils/conf</userinput></screen>\r
                                <screen><userinput>make</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>As the <systemitem class="username">root</systemitem> user, install \r
                                <application>Evergreen</application>:</para>\r
-                               <screen><userinput>make STAFF_CLIENT_BUILD_ID=rel_1_6_2_0 install</userinput></screen>\r
+                               <screen><userinput>make STAFF_CLIENT_BUILD_ID=rel_1_6_1_5 install</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Change to the <application>Evergreen</application> installation \r
                                directory:</para>\r
-                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.2.0</userinput></screen>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.1.5</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>As the <emphasis>root</emphasis> user, change all files to be owned by the \r
@@ -228,7 +228,7 @@ tar xzf Evergreen-ILS-1.6.2.0.tar.gz
                                <para>As the <systemitem class="username">root</systemitem> user, build <filename>live-db-setup.pl</filename> for the cgi-bin \r
                                bootstrapping scripts and <filename>offline-config.pl</filename> for the offline staff client data uploader:</para>\r
 <screen><userinput>\r
-cd /home/opensrf/Evergreen-ILS-1.6.2.0\r
+cd /home/opensrf/Evergreen-ILS-1.6.1.5\r
 perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-offline \ \r
 --user evergreen --password evergreen --hostname localhost --port 5432 \\r
 --database evergreen\r
@@ -239,7 +239,7 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-of
 <screen><userinput>\r
 cd /openils/var/web/xul/\r
 rm server\r
-ln -s rel_1_6_2_0/server\r
+ln -s rel_1_6_1_5/server\r
 </userinput></screen>\r
                        </step>\r
                        <step>\r
@@ -258,7 +258,6 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.2-1.6.1.3-upgrade-db.sql evergreen\r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.3-1.6.1.4-upgrade-db.sql evergreen\r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.4-1.6.1.5-upgrade-db.sql evergreen\r
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.2-upgrade-db.sql evergreen\r
 </userinput>\r
 </screen>      \r
                        </step>\r
@@ -304,13 +303,13 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all
                        </step> \r
                </procedure>    \r
        </section>\r
-       <section xml:id="upgradingevergreen_1.6.0_to_1.6.2">\r
-               <title>Upgrade <application>Evergreen</application>from 1.6.0 to 1.6.2</title>\r
+       <section xml:id="upgradingevergreen_1.6.0_to_1.6.1">\r
+               <title>Upgrade <application>Evergreen</application> from 1.6.0 to 1.6.1</title>\r
                <procedure>\r
                        <step>\r
-                               <para>Follow steps 1-8 of the <link linkend="upgradingevergreen-upgrading_from_1.4_to_1.6.2">instructions for upgrading Evergreen from 1.4</link> \r
+                               <para>Follow steps 1-8 of the <link linkend="upgradingevergreen-upgrading_from_1.4_to_1.6.1">instructions for upgrading Evergreen from 1.4</link></para> \r
                                \r
-                       \r
+                       </step>\r
                        <step>\r
                                <para>Update the Evergreen database:</para>\r
                                <note><para>it is recommended that you <link linkend="backingup">back up your Evergreen database</link> in order to restore your data if anything goes wrong.</para></note>\r
@@ -322,38 +321,14 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.2-1.6.1.3-upgrade-db.sql evergreen\r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.3-1.6.1.4-upgrade-db.sql evergreen\r
 psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.4-1.6.1.5-upgrade-db.sql evergreen\r
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.2-upgrade-db.sql evergreen\r
 </userinput>\r
 </screen>      \r
                        </step>\r
                        <step>\r
-                               <para>Follow steps 10-16 of the <link linkend="upgradingevergreen-upgrading_from_1.4_to_1.6.2">instructions for upgrading Evergreen from 1.4</link> \r
+                               <para>Follow steps 10-16 of the <link linkend="upgradingevergreen-upgrading_from_1.4_to_1.6.1">instructions for upgrading Evergreen from 1.4</link></para>\r
                                \r
                        \r
-                       <step>\r
-               </procedure>    \r
-       </section>\r
-       <section xml:id="upgradingevergreen_1.6.1 to_1.6.2">\r
-               <title>Upgrade <application>Evergreen</application>from 1.6.1 to 1.6.2</title>\r
-               <procedure>\r
-                       <step>\r
-                               <para>Follow steps 1-8 of the <link linkend="upgradingevergreen-upgrading_from_1.4_to_1.6.2">instructions for upgrading Evergreen from 1.4</link> \r
-                               \r
-                       \r
-                       <step>\r
-                               <para>Update the Evergreen database:</para>\r
-                               <note><para>it is recommended that you <link linkend="backingup">back up your Evergreen database</link> in order to restore your data if anything goes wrong.</para></note>\r
-<screen>\r
-<userinput>\r
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.2-upgrade-db.sql evergreen\r
-</userinput>\r
-</screen>      \r
                        </step>\r
-                       <step>\r
-                               <para>Follow steps 10-16 of the <link linkend="upgradingevergreen-upgrading_from_1.4_to_1.6.2">instructions for upgrading Evergreen from 1.4</link> \r
-                               \r
-                       \r
-                       <step>\r
                </procedure>    \r
        </section>\r
        <section xml:id="testing_after_upgrade">\r
@@ -394,7 +369,7 @@ cd /openils/bin
        </section>\r
        <section xml:id="upgrading_Postgresqlto8.4">\r
                <title>Upgrading PostgreSQL from 8.2 to 8.4</title>\r
-               <para>Evergreen 1.6.2 supports PostgreSQL version 8.4 and it is recommended that you upgrade PostgreSQL when you upgrade Evergreen to 1.6.</para>\r
+               <para>Evergreen 1.6.1 supports PostgreSQL version 8.4 and it is recommended that you upgrade PostgreSQL when you upgrade Evergreen to 1.6.</para>\r
                <note><para>The order of the following steps is very important.</para></note><indexterm><primary>databases</primary><secondary>PostgreSQL</secondary></indexterm>\r
                <procedure>\r
                        <step>\r
@@ -446,5 +421,5 @@ psql -f /usr/share/postgresql/8.4/contrib/pgxml.sql evergreen
                                <para><ulink url="http://www.postgresql.org/docs/current/static/tsearch2.html#AEN102824" /></para>\r
                        </step>\r
                </procedure>\r
-       </simplesect>\r
+       </section>\r
 </chapter>\r

diff --git a/tools/2.0Convert.sh b/tools/2.0Convert.sh
new file mode 100755 (executable)
index 0000000..8a8e7d7
--- /dev/null
+++ b/tools/2.0Convert.sh
@@ -0,0 +1,31 @@
+#/bin/bash
+
+#generate 2.0 draft html
+ xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/2.0/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml-2.0.xsl ~/Evergreen-DocBook/2.0/root.xml
+
+
+#Generate 2.0 PDF via FO
+ xsltproc --xinclude  --output ~/Evergreen-DocBook/2.0/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/2.0/root.xml
+
+# must run fop from same directory as root.xml
+cd ~/Evergreen-DocBook/2.0/
+
+ ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/2.0/draft/pdf/Evergreen_Documentation.pdf 
+
+# remove temporary .fo file
+rm pdf/temp.fo
+
+#generate 1.6 draft html
+# xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/1.6/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml
+
+
+#Generate 1.6 PDF via FO
+# xsltproc --xinclude  --output ~/Evergreen-DocBook/1.6/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/1.6/root.xml
+
+# must run fop from same directory as root.xml
+#cd ~/Evergreen-DocBook/1.6/
+
+# ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/1.6/draft/pdf/Evergreen_Documentation.pdf 
+
+# remove temporary .fo file
+#rm pdf/temp.fo

diff --git a/tools/docbookConvert.sh b/tools/docbookConvert.sh
index 711c20f..a871727 100755 (executable)
--- a/tools/docbookConvert.sh
+++ b/tools/docbookConvert.sh
@@ -1,10 +1,25 @@
 #/bin/bash
 
-#generate draft html
+#generate 2.0 draft html
+ xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/2.0/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml-2.0.xsl ~/Evergreen-DocBook/2.0/root.xml
+
+
+#Generate 2.0 PDF via FO
+ xsltproc --xinclude  --output ~/Evergreen-DocBook/2.0/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/2.0/root.xml
+
+# must run fop from same directory as root.xml
+cd ~/Evergreen-DocBook/2.0/
+
+ ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/2.0/draft/pdf/Evergreen_Documentation.pdf 
+
+# remove temporary .fo file
+rm pdf/temp.fo
+
+#generate 1.6 draft html
  xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/1.6/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml
 
 
-#Generate PDF via FO
+#Generate 1.6 PDF via FO
  xsltproc --xinclude  --output ~/Evergreen-DocBook/1.6/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/1.6/root.xml
 
 # must run fop from same directory as root.xml

diff --git a/tools/docbtest.sh b/tools/docbtest.sh
new file mode 100755 (executable)
index 0000000..a9fa84d
--- /dev/null
+++ b/tools/docbtest.sh
@@ -0,0 +1,16 @@
+#/bin/bash
+
+#generate draft html
+ # xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/1.6/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml
+
+
+#Generate PDF via FO
+ xsltproc --xinclude  --output ~/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/1.6/test.xml
+
+# must run fop from same directory as file
+cd ~/Evergreen-DocBook/1.6/
+
+ ~/doctools/fop/fop -fo ~/temp.fo -pdf ~/testfile.pdf 
+
+# remove temporary .fo file
+rm pdf/temp.fo