doc fixes

Author: apb2006

readme.md

@@ -1,14 +1,35 @@
 # expkg-zone58.image.metadata
 An XQuery library to extract image metadata as XML using the 
 [Drew Noakes library](http://drewnoakes.com/code/exif/)  
-The output xml format matches the o/p of the [Xmlcalabash](http://xmlcalabash.com/) metadata extension. 
-````
+The output XML format matches the o/p of the [Xmlcalabash](http://xmlcalabash.com/) metadata extension. 
+```
+import module namespace imgmeta = "expkg-zone58:image.metadata" ;
+
+declare variable $pic1:=resolve-uri("simple.jpg"); 
+imgmeta:read($pic1)
 <metadata>
- <tag name=".." dir=".." type="..">value</tag>
- <tag ..
-</metadata>
+  <tag name="Compression Type" dir="JPEG" type="0xfffffffd">Baseline</tag>
+  <tag name="Data Precision" dir="JPEG" type="0x0000">8 bits</tag>
+  <tag name="Image Height" dir="JPEG" type="0x0001">600 pixels</tag>
+  <tag name="Image Width" dir="JPEG" type="0x0003">800 pixels</tag>
+  <tag name="Number of Components" dir="JPEG" type="0x0005">3</tag>
+  <tag name="Component 1" dir="JPEG" type="0x0006">Y component: Quantization table 0, Sampling factors 2 horiz/2 vert</tag>
+  <tag name="Component 2" dir="JPEG" type="0x0007">Cb component: Quantization table 1, Sampling factors 1 horiz/1 vert</tag>
+  <tag name="Component 3" dir="JPEG" type="0x0008">Cr component: Quantization table 1, Sampling factors 1 horiz/1 vert</tag>
+  <tag name="JPEG Comment" dir="JpegComment" type="0x0000">AppleMark
+</tag>
+  <tag name="Make" dir="Exif IFD0" type="0x010f">Canon</tag>
+  <tag name="Model" dir="Exif IFD0" type="0x0110">Canon PowerShot S330</tag>
+  <tag name="Orientation" dir="Exif IFD0" type="0x0112">Top, left side (Horizontal / normal)</tag>
+  <tag name="X Resolution" dir="Exif IFD0" type="0x011a">180 dots per inch</tag>
+  <tag name="Y Resolution" dir="Exif IFD0" type="0x011b">180 dots per inch</tag>
+  <tag name="Resolution Unit" dir="Exif IFD0" type="0x0128">Inch</tag>
+  <tag name="Software" dir="Exif IFD0" type="0x0131">QuickTime 6.0.2</tag>
+  <tag name="Date/Time" dir="Exif IFD0" type="0x0132">2002-11-18T22:46:09</tag>
+  <tag name="Host Computer" dir="Exif IFD0" type="0x013c">Mac OS X 10.2.2</tag>
+..
 ````
-BaseX 8.2.1+ required.
+
 
 # Usage
 ````

src/main/content/metadata-extractor.xqm

@@ -34,7 +34,7 @@ declare function imgmeta:read($path as xs:string) as element(metadata)
    try {
     <metadata>{imgmeta:tags($path)}</metadata>
    } catch * {
-    <metadata error="{$err:description}"/> 
+    <metadata error="{$err:code}">{$err:description}</metadata>
    }
 };
 
@@ -193,6 +193,6 @@ declare function imgmeta:core($metadata as element(metadata)) as element()*
             if($d3 castable as xs:dateTime) then <datedigitized>{$d3/fn:string()}</datedigitized> else (),
             if($c) then <caption>{$c/fn:string()}</caption> else (),
             if($m) then <model>{$m/fn:string()}</model> else (),
-            if($w and $h)  then (<width>{$w}</width>,<height>{$h}</height>) else ()
+            if($w and $h)  then (<width>{$w}</width>,<height>{$h}</height>) else ()   
             )
 }; 

src/test/gui-test.xq

@@ -3,7 +3,7 @@
  :)
 
 import module namespace metadata = "expkg-zone58:image.metadata" at "../main/content/metadata-extractor.xqm";
-declare namespace URL="java:java.net.URL";
+
 
 declare variable $pic1:=resolve-uri("simple.jpg"); 
 

src/test/test.xqm

@@ -14,4 +14,18 @@ declare
   let $meta:=metadata:read($test:pic1)
   return unit:assert($meta/tag)
 };
-  
+
+(:~ we get core info :)
+declare
+  %unit:test
+  function test:core() {
+  let $meta:=metadata:read($test:pic1)
+  return unit:assert(metadata:core($meta))
+};  
+(:~ we get no keyword info :)
+declare
+  %unit:test
+  function test:keywords() {
+  let $meta:=metadata:read($test:pic1)
+  return unit:assert(metadata:keywords($meta)=>fn:empty())
+};