Conf for AlternativeImage

PRImA-Research-Lab · Jun 22, 2018 · 74e2614 · 74e2614
1 parent 8884037
commit 74e2614
Showing 1 changed file with 16 additions and 36 deletions.
diff --git a/pagecontent/schema/pagecontent.xsd b/pagecontent/schema/pagecontent.xsd
@@ -312,16 +312,10 @@
 				<documentation>Inner-block order of text lines (in addition to “readingDirection” which is the inner-text line order of words and characters) (lower-level definitions override the page-level definition)</documentation>
 			</annotation>
 		</attribute>
-		<attribute name="conf" use="optional">
+		<attribute name="conf" type="pc:ConfSimpleType" use="optional">
             <annotation>
             	<documentation>Confidence value for whole page (between 0 and 1)</documentation>
             </annotation>
-            <simpleType>
-            	<restriction base="float">
-            		<minInclusive value="0"></minInclusive>
-            		<maxInclusive value="1"></maxInclusive>
-            	</restriction>
-            </simpleType>
 		</attribute>
 
 	</complexType>
@@ -444,16 +438,10 @@ Range: -179.999,180</documentation>
             	<documentation>Point list with format "x1,y1 x2,y2 ..."</documentation>
             </annotation>
 		</attribute>
-		<attribute name="conf" use="optional">
+		<attribute name="conf" type="pc:ConfSimpleType" use="optional">
             <annotation>
             	<documentation>Confidence value (between 0 and 1)</documentation>
             </annotation>
-            <simpleType>
-            	<restriction base="float">
-            		<minInclusive value="0"></minInclusive>
-            		<maxInclusive value="1"></maxInclusive>
-            	</restriction>
-            </simpleType>
 		</attribute>
 	</complexType>
 	<complexType name="TextLineType">
@@ -725,16 +713,10 @@ Range: -179.999,180</documentation>
 				</restriction>
 			</simpleType>
 		</attribute>
-		<attribute name="conf">
+		<attribute name="conf" type="pc:ConfSimpleType" use="optional">
             <annotation>
             	<documentation>OCR confidence value (between 0 and 1)</documentation>
             </annotation>
-            <simpleType>
-            	<restriction base="float">
-            		<minInclusive value="0"></minInclusive>
-            		<maxInclusive value="1"></maxInclusive>
-            	</restriction>
-            </simpleType>
 		</attribute>
 		<attribute name="dataType" type="pc:TextDataTypeSimpleType" use="optional">
 				<annotation>
@@ -1261,16 +1243,10 @@ It does not contain pagenumber (if not part of running title), marginals, signat
             <element name="UnorderedGroup" type="pc:UnorderedGroupType"></element>
 		</choice>
 
-		<attribute name="conf" use="optional">
+		<attribute name="conf" type="pc:ConfSimpleType" use="optional">
             <annotation>
             	<documentation>Confidence value (between 0 and 1)</documentation>
             </annotation>
-            <simpleType>
-            	<restriction base="float">
-            		<minInclusive value="0"></minInclusive>
-            		<maxInclusive value="1"></maxInclusive>
-            	</restriction>
-            </simpleType>
 		</attribute>
 
 	</complexType>
@@ -1546,7 +1522,12 @@ It does not contain pagenumber (if not part of running title), marginals, signat
 			<enumeration value="other"></enumeration>
 		</restriction>
     </simpleType>
-
+    <simpleType name="ConfSimpleType">
+    	<restriction base="float">
+         	<minInclusive value="0"></minInclusive>
+         	<maxInclusive value="1"></maxInclusive>
+        </restriction>
+    </simpleType>
     <simpleType name="LanguageSimpleType">
         <annotation>
         	<documentation> ISO 639.x 2016-07-14</documentation>
@@ -1992,16 +1973,10 @@ It does not contain pagenumber (if not part of running title), marginals, signat
 
     <complexType name="BaselineType">
     	<attribute name="points" type="pc:PointsType" use="required"></attribute>
-		<attribute name="conf" use="optional">
+		<attribute name="conf" type="pc:ConfSimpleType" use="optional">
             <annotation>
             	<documentation>Confidence value (between 0 and 1)</documentation>
             </annotation>
-            <simpleType>
-            	<restriction base="float">
-            		<minInclusive value="0"></minInclusive>
-            		<maxInclusive value="1"></maxInclusive>
-            	</restriction>
-            </simpleType>
 		</attribute>
     </complexType>
 
@@ -2237,6 +2212,11 @@ It does not contain pagenumber (if not part of running title), marginals, signat
     <complexType name="AlternativeImageType">
     	<attribute name="filename" type="string" use="required"></attribute>
     	<attribute name="comments" type="string"></attribute>
+    	<attribute name="conf" type="pc:ConfSimpleType" use="optional">
+            <annotation>
+            	<documentation>Confidence value (between 0 and 1)</documentation>
+            </annotation>
+		</attribute>    	
     </complexType>
 
     <simpleType name="AlignSimpleType">