Changeset 2044

Timestamp:

07/19/12 15:41:01 (12 years ago)

Author:

sanmai

Message:

• Fix a bug that was not noticed before because it happened not to disrupt the script ($KML/Z_file_relpath).
• Copy final KMZ file to a location for publication on the public DoBeS website.

Location:

CLARIN_KML

Files:

• . (modified) (1 prop)
• exec/generate_CLARIN_KMZ.sh (modified) (4 diffs)

CLARIN_KML

@@ +1 @@
+.input
 .output

@@ +1 @@
+.input
 .output

CLARIN_KML/exec/generate_CLARIN_KMZ.sh

@@ -50 +50 @@
 KML_final_file_path="${OUTPUT_directory_path}/doc.kml";
 KMZ_final_file_path="${OUTPUT_directory_path}/language_sites.kmz";
+KMZ_publication_directory_path='/var/www/drupal/external/kml/';
 
 timestamp=$( date +%H:%M:%S );
@@ -78 +79 @@
 fi
 
-if test -r "${OUTPUT_directory_path}" -a -r "${SAXON_JAR_file_path}" -a -x "${CSV2XML_file_path}" -a -r "${XSLT_1_file_path}" -a -r "${XSLT_1_file_path}" -a -r "${XSLT_2_file_path}" -a -r "${XSLT_3_file_path}"
+if test -r "${OUTPUT_directory_path}" -a -r "${SAXON_JAR_file_path}" -a -x "${CSV2XML_file_path}" -a -r "${XSLT_1_file_path}" -a -r "${XSLT_1_file_path}" -a -r "${XSLT_2_file_path}" -a -r "${XSLT_3_file_path}" -a -r "${KMZ_publication_directory_path}"
 then
         if test -r "${KMZ_original_file_path}" -a -r "${CSV_file_path}"
@@ -115 +116 @@
                 fi
 
-                echo -e "\n\n${bold}Zipping doc.kml to KMZ file ${KMZ_final_file_path} ...${normal}";
+                echo -e "\n\n${bold}Zipping ${KML_final_file_path} to KMZ file ${KMZ_final_file_path} and moving it to "${KMZ_publication_directory_path}" ...${normal}";
                 cd $(dirname "${KML_final_file_path}");
-                KMZ_final_file_relpath=$(basename "${KML_final_file_path}");
+                KML_final_file_relpath=$(basename "${KML_final_file_path}");
 
-                zip -9 -D "${KMZ_final_file_path}" "${KMZ_final_file_relpath}"; # X- path corruption! --junk-paths --no-dir-entries -X
+                zip -9 -D "${KMZ_final_file_path}" "${KML_final_file_relpath}";
 
-                rm "${KMZ_final_file_relpath}";
+                rm "${KML_final_file_relpath}";
                 rm "${KML_original_file_path}";
+
+                cp -v --remove-destination "${KMZ_final_file_path}" -t "${KMZ_publication_directory_path}/";
         else
                 echo -e "ERROR: The input data file(s) ${KMZ_original_file_path}\nand/or\n${CSV_file_path} is/are not existent as well as readable/executable!";
@@ -128 +131 @@
         fi
 else
-        echo -e "ERROR: One or more of the following script files is not existent as well as readable: \n${OUTPUT_directory_path}\n${SAXON_JAR_file_path}\n${CSV2XML_file_path}\n${XSLT_1_file_path}\n${XSLT_1_file_path}\n${XSLT_2_file_path}\n${XSLT_3_file_path}";
+        echo -e "ERROR: One or more of the following script files is not existent as well as readable: \n${OUTPUT_directory_path}\n${SAXON_JAR_file_path}\n${CSV2XML_file_path}\n${XSLT_1_file_path}\n${XSLT_1_file_path}\n${XSLT_2_file_path}\n${XSLT_3_file_path}\n${KMZ_publication_directory_path}";
         exit 2;
 fi

@@ +1 @@
+.input
 .output