Merge pull request #70 from voc/69-timezone

add optional time_zone_name element to schedule XML schema
voc · Sep 13, 2020 · db5fde7 · db5fde7
2 parents ec57260 + 8fb8875
commit db5fde7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/validator/xsd/schedule-without-person.xml.xsd b/validator/xsd/schedule-without-person.xml.xsd
@@ -22,6 +22,7 @@
               <xs:element type="xs:integer" name="days" minOccurs="0"/>
               <xs:element type="duration"   name="timeslot_duration" minOccurs="0"/>
               <xs:element type="httpURI"    name="base_url" minOccurs="0"/>
+              <xs:element type="xs:string"  name="time_zone_name" minOccurs="0" maxOccurs="1"/>
             </xs:all>
           </xs:complexType>
         </xs:element>

diff --git a/validator/xsd/schedule.xml.xsd b/validator/xsd/schedule.xml.xsd
@@ -22,6 +22,7 @@
               <xs:element type="xs:integer" name="days" minOccurs="0"/>
               <xs:element type="duration"   name="timeslot_duration" minOccurs="0"/>
               <xs:element type="httpURI"    name="base_url" minOccurs="0"/>
+              <xs:element type="xs:string"  name="time_zone_name" minOccurs="0" maxOccurs="1"/>
             </xs:all>
           </xs:complexType>
         </xs:element>

diff --git a/validator/xsd/validate_schedule_xml.sh b/validator/xsd/validate_schedule_xml.sh
@@ -9,23 +9,24 @@ if [ -z "${xmllint_cmd}" ]; then
   exit 1
 fi
 
-if [ -z "${curl_cmd}" ]; then
-  echo "Please install curl!"
-fi
 
 if [ -z "${1}" ]; then
   echo "Please provide schedule xml http(s) URL."
   echo "  ${0} http://example.com/schedule.xml"
-  exit 1
+  exit 2
 fi
 
 if [ ! -e "${xsd_file}" ]; then
   echo "schedule.xml.xsd missing!"
-  exit 1
+  exit 3
 fi
 
 case "$1" in
   http://*|https://*)
+    if [ -z "${curl_cmd}" ]; then
+      echo "Please install curl!" >&2
+      exit 4
+    fi
     $curl_cmd $1 2>/dev/null | $xmllint_cmd --noout --schema ${xsd_file} -;;
   *)
     $xmllint_cmd --noout --schema ${xsd_file} $1;;