perfsonar development work

Author: zurawski
Date: 2006-11-07 18:39:07 -0500 (Tue, 07 Nov 2006)
New Revision: 1744

Modified:
   trunk/perfsonar/schema/nmwg/nmtopo_ver3.rnc
Log:
New elements/use for location (used within the'node' element).

-jason



Modified: trunk/perfsonar/schema/nmwg/nmtopo_ver3.rnc
===================================================================
--- trunk/perfsonar/schema/nmwg/nmtopo_ver3.rnc 2006-11-07 15:45:35 UTC (rev 
1743)
+++ trunk/perfsonar/schema/nmwg/nmtopo_ver3.rnc 2006-11-07 23:39:07 UTC (rev 
1744)
@@ -124,19 +124,29 @@
        element nmwgtopo3:description { xsd:string }? &
        element nmwgtopo3:cpu { xsd:string }? &
        element nmwgtopo3:operSys { xsd:string }? &
-       element nmwgtopo3:location { xsd:string }? &
-       element nmwgtopo3:country { xsd:string }? &
-       element nmwgtopo3:city { xsd:string }? &
-       element nmwgtopo3:latitude { xsd:string }? &
-       element nmwgtopo3:longitude { xsd:string }? &   
-       element nmwgtopo3:institution { xsd:string }? &
+       element nmwgtopo3:location { LocationContent }? &
        (
                BaseInterface |
                L2Interface |
                L3Interface
        )*
 
+LocationContent = 
+       element nmwgtopo3:institution { xsd:string }? & 
+       element nmwgtopo3:country { xsd:string }? &
+       element nmwgtopo3:zipcode { xsd:integer }? &
+       element nmwgtopo3:state { xsd:string }? &
+       element nmwgtopo3:city { xsd:string }? &
+       element nmwgtopo3:streetAddress { xsd:string }? &
+       element nmwgtopo3:floor { xsd:string }? &
+       element nmwgtopo3:room { xsd:string }? &
+       element nmwgtopo3:cage { xsd:string }? &
+       element nmwgtopo3:rack { xsd:string }? &        
+       element nmwgtopo3:shelf { xsd:string }? &                       
+       element nmwgtopo3:latitude { xsd:float }? &
+       element nmwgtopo3:longitude { xsd:float }? &    
 
+
 ## ########################
 ## generic path
 ## ########################