Permalink
Browse files

OK, the search results now return the formats used in those results. …

…We'll need to do a lot of testing.
  • Loading branch information...
1 parent 513f388 commit 9f96a91cd6a948c91454e3101ca5e66d4e89c7c8 Chris M committed May 24, 2012
@@ -69,7 +69,6 @@
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="details" type="xs:string"/>
</xs:sequence>
- <xs:attribute name="id" use="required" type="xs:integer"/>
</xs:complexType>
</xs:element>
</xs:sequence>
@@ -60,7 +60,6 @@
<xs:element ref="xsn:lang"/>
<xs:element ref="xsn:id"/>
</xs:sequence>
- <xs:attribute name="id" use="required" type="xs:integer"/>
</xs:complexType>
</xs:element>
<xs:element name="key_string" type="xs:NCName"/>
@@ -95,12 +95,28 @@
}
?>
</xs:sequence>
- <xs:attribute name="id" use="required" type="xs:integer"/>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="formats" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="row" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="key_string" type="xs:NCName"/>
+ <xs:element name="name_string" type="xs:string"/>
+ <xs:element name="description_string" type="xs:string"/>
+ <xs:element name="lang" type="xs:NCName"/>
+ <xs:element name="id" type="xs:integer"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:schema><?php
ob_end_flush();
}
@@ -58,7 +58,7 @@ function array2xml( $array, ///< The input array
{
if (is_array($child))
{
- $output .= '<' . (is_string($root) ? htmlspecialchars($root) : $ArrayNumberPrefix .' id="' . $root . '"') . '>';
+ $output .= '<' . (is_string($root) ? htmlspecialchars($root) : $ArrayNumberPrefix) . '>';
$nested++;
$output .= array2xml($child, null, null, false);
$nested--;

0 comments on commit 9f96a91

Please sign in to comment.