Index: main/trunk/model-sites-dev/pei-jones/collect/written-works/archives/3C01-01.dir/doc.xml
===================================================================
--- main/trunk/model-sites-dev/pei-jones/collect/written-works/archives/3C01-01.dir/doc.xml	(revision 31894)
+++ main/trunk/model-sites-dev/pei-jones/collect/written-works/archives/3C01-01.dir/doc.xml	(revision 32143)
@@ -31,21 +31,27 @@
     <Metadata name="assocfilepath">3C01-01.dir</Metadata>
     <Metadata name="gsdlassocfile">3C01-01-000.tif:image/tiff:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-000_thumb.gif:image/gif:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-000_screen.jpeg:image/jpeg:</Metadata>
+<Metadata name="gsdlassocfile">3C01-01-000.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-000_thumb.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-000_screen.png:image/png:</Metadata>
     <Metadata name="gsdlassocfile">3C01-01-001.tif:image/tiff:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-001_thumb.gif:image/gif:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-001_screen.jpeg:image/jpeg:</Metadata>
+<Metadata name="gsdlassocfile">3C01-01-001.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-001_thumb.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-001_screen.png:image/png:</Metadata>
     <Metadata name="gsdlassocfile">3C01-01-002.tif:image/tiff:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-002_thumb.gif:image/gif:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-002_screen.jpeg:image/jpeg:</Metadata>
+<Metadata name="gsdlassocfile">3C01-01-002.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-002_thumb.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-002_screen.png:image/png:</Metadata>
     <Metadata name="gsdlassocfile">3C01-01-003.tif:image/tiff:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-003_thumb.gif:image/gif:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-003_screen.jpeg:image/jpeg:</Metadata>
+<Metadata name="gsdlassocfile">3C01-01-003.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-003_thumb.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-003_screen.png:image/png:</Metadata>
     <Metadata name="gsdlassocfile">3C01-01-004.tif:image/tiff:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-004_thumb.gif:image/gif:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-004_screen.jpeg:image/jpeg:</Metadata>
+<Metadata name="gsdlassocfile">3C01-01-004.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-004_thumb.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-004_screen.png:image/png:</Metadata>
     <Metadata name="gsdlassocfile">3C01-01-005.tif:image/tiff:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-005_thumb.gif:image/gif:</Metadata>
-    <Metadata name="gsdlassocfile">3C01-01-005_screen.jpeg:image/jpeg:</Metadata>
+<Metadata name="gsdlassocfile">3C01-01-005.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-005_thumb.png:image/png:</Metadata>
+    <Metadata name="gsdlassocfile">3C01-01-005_screen.png:image/png:</Metadata>
       <Metadata mode="accumulate" name="pj.Catalogue-Number">3C1/1</Metadata>
             <Metadata mode="accumulate" name="pj.Catalogue-Short">3C1</Metadata>
@@ -57,22 +63,22 @@
   <Description>
     <Metadata name="Title">1</Metadata>
-    <Metadata name="Image">3C01-01-000.tif</Metadata>
+    <Metadata name="Image">3C01-01-000.png</Metadata>
     <Metadata name="Source">3C01-01-000.tif</Metadata>
     <Metadata name="SourceFile">3C01-01-000.tif</Metadata>
     <Metadata name="FileSize">434375</Metadata>
-    <Metadata name="ImageType">TIFF</Metadata>
+    <Metadata name="ImageType">PNG</Metadata>
     <Metadata name="ImageWidth">1708</Metadata>
     <Metadata name="ImageHeight">1660</Metadata>
     <Metadata name="ImageSize">434KB</Metadata>
-    <Metadata name="srclink_file">3C01-01-000.tif</Metadata>
-    <Metadata name="srclinkFile">3C01-01-000.tif</Metadata>
-    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
-    <Metadata name="ThumbType">gif</Metadata>
-    <Metadata name="Thumb">3C01-01-000_thumb.gif</Metadata>
+    <Metadata name="srclink_file">3C01-01-000.png</Metadata>
+    <Metadata name="srclinkFile">3C01-01-000.png</Metadata>
+    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
+    <Metadata name="ThumbType">png</Metadata>
+    <Metadata name="Thumb">3C01-01-000_thumb.png</Metadata>
     <Metadata name="thumbicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Thumb]&quot; alt=&quot;[Thumb]&quot; width=&quot;[ThumbWidth]&quot; height=&quot;[ThumbHeight]&quot;&gt;</Metadata>
     <Metadata name="ThumbWidth">100</Metadata>
     <Metadata name="ThumbHeight">97</Metadata>
-    <Metadata name="ScreenType">jpeg</Metadata>
-    <Metadata name="Screen">3C01-01-000_screen.jpeg</Metadata>
+    <Metadata name="ScreenType">png</Metadata>
+    <Metadata name="Screen">3C01-01-000_screen.png</Metadata>
     <Metadata name="screenicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Screen]&quot; width=[ScreenWidth] height=[ScreenHeight]&gt;</Metadata>
     <Metadata name="ScreenWidth">500</Metadata>
@@ -89,22 +95,22 @@
   <Description>
     <Metadata name="Title">2</Metadata>
-    <Metadata name="Image">3C01-01-001.tif</Metadata>
+    <Metadata name="Image">3C01-01-001.png</Metadata>
     <Metadata name="Source">3C01-01-001.tif</Metadata>
     <Metadata name="SourceFile">3C01-01-001.tif</Metadata>
     <Metadata name="FileSize">989099</Metadata>
-    <Metadata name="ImageType">TIFF</Metadata>
+    <Metadata name="ImageType">PNG</Metadata>
     <Metadata name="ImageWidth">1696</Metadata>
     <Metadata name="ImageHeight">2593</Metadata>
     <Metadata name="ImageSize">989KB</Metadata>
-    <Metadata name="srclink_file">3C01-01-001.tif</Metadata>
-    <Metadata name="srclinkFile">3C01-01-001.tif</Metadata>
-    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
-    <Metadata name="ThumbType">gif</Metadata>
-    <Metadata name="Thumb">3C01-01-001_thumb.gif</Metadata>
+    <Metadata name="srclink_file">3C01-01-001.png</Metadata>
+    <Metadata name="srclinkFile">3C01-01-001.png</Metadata>
+    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
+    <Metadata name="ThumbType">png</Metadata>
+    <Metadata name="Thumb">3C01-01-001_thumb.png</Metadata>
     <Metadata name="thumbicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Thumb]&quot; alt=&quot;[Thumb]&quot; width=&quot;[ThumbWidth]&quot; height=&quot;[ThumbHeight]&quot;&gt;</Metadata>
     <Metadata name="ThumbWidth">65</Metadata>
     <Metadata name="ThumbHeight">100</Metadata>
-    <Metadata name="ScreenType">jpeg</Metadata>
-    <Metadata name="Screen">3C01-01-001_screen.jpeg</Metadata>
+    <Metadata name="ScreenType">png</Metadata>
+    <Metadata name="Screen">3C01-01-001_screen.png</Metadata>
     <Metadata name="screenicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Screen]&quot; width=[ScreenWidth] height=[ScreenHeight]&gt;</Metadata>
     <Metadata name="ScreenWidth">327</Metadata>
@@ -121,5 +127,6 @@
             <Metadata mode="accumulate" name="pj.Notes">English</Metadata>
             <Metadata mode="accumulate" name="pj.Access">unrestricted</Metadata>
-            <Metadata mode="accumulate" name="pj.PersonOfInterest">Bruce Biggs; Kupe</Metadata>
+            <Metadata mode="accumulate" name="pj.PersonOfInterest">Bruce Biggs</Metadata>
+<Metadata mode="accumulate" name="pj.PersonOfInterest">Kupe</Metadata>
             
             <Metadata mode="accumulate" name="pj.Correspondent">Bruce Biggs</Metadata>
@@ -134,22 +141,22 @@
   <Description>
     <Metadata name="Title">3</Metadata>
-    <Metadata name="Image">3C01-01-002.tif</Metadata>
+    <Metadata name="Image">3C01-01-002.png</Metadata>
     <Metadata name="Source">3C01-01-002.tif</Metadata>
     <Metadata name="SourceFile">3C01-01-002.tif</Metadata>
     <Metadata name="FileSize">1696183</Metadata>
-    <Metadata name="ImageType">TIFF</Metadata>
+    <Metadata name="ImageType">PNG</Metadata>
     <Metadata name="ImageWidth">1769</Metadata>
     <Metadata name="ImageHeight">3229</Metadata>
     <Metadata name="ImageSize">1.696MB</Metadata>
-    <Metadata name="srclink_file">3C01-01-002.tif</Metadata>
-    <Metadata name="srclinkFile">3C01-01-002.tif</Metadata>
-    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
-    <Metadata name="ThumbType">gif</Metadata>
-    <Metadata name="Thumb">3C01-01-002_thumb.gif</Metadata>
+    <Metadata name="srclink_file">3C01-01-002.png</Metadata>
+    <Metadata name="srclinkFile">3C01-01-002.png</Metadata>
+    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
+    <Metadata name="ThumbType">png</Metadata>
+    <Metadata name="Thumb">3C01-01-002_thumb.png</Metadata>
     <Metadata name="thumbicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Thumb]&quot; alt=&quot;[Thumb]&quot; width=&quot;[ThumbWidth]&quot; height=&quot;[ThumbHeight]&quot;&gt;</Metadata>
     <Metadata name="ThumbWidth">55</Metadata>
     <Metadata name="ThumbHeight">100</Metadata>
-    <Metadata name="ScreenType">jpeg</Metadata>
-    <Metadata name="Screen">3C01-01-002_screen.jpeg</Metadata>
+    <Metadata name="ScreenType">png</Metadata>
+    <Metadata name="Screen">3C01-01-002_screen.png</Metadata>
     <Metadata name="screenicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Screen]&quot; width=[ScreenWidth] height=[ScreenHeight]&gt;</Metadata>
     <Metadata name="ScreenWidth">274</Metadata>
@@ -158,12 +165,15 @@
       <Metadata mode="accumulate" name="pj.Title">Letter and copy of manuscript from Bruce Biggs</Metadata>
             <Metadata mode="accumulate" name="pj.Date">19541124</Metadata>
-            <Metadata mode="accumulate" name="pj.Author">Bruce Biggs; Himiona Kamira</Metadata>
+            <Metadata mode="accumulate" name="pj.Author">Bruce Biggs</Metadata>
+<Metadata mode="accumulate" name="pj.Author">Himiona Kamira</Metadata>
             <Metadata mode="accumulate" name="pj.Description">Letter from Bruce accompanies a manuscript from Himiona Kamira regarding material on Kupe</Metadata>
-            <Metadata mode="accumulate" name="pj.Subject">Manuscript; Kupe</Metadata>
+            <Metadata mode="accumulate" name="pj.Subject">Manuscript</Metadata>
+<Metadata mode="accumulate" name="pj.Subject">Kupe</Metadata>
             <Metadata mode="accumulate" name="pj.MSHeading">MÄtauranga</Metadata>
             <Metadata mode="accumulate" name="pj.Document-Type">Letter; manuscript</Metadata>
             <Metadata mode="accumulate" name="pj.Notes">Letter in English, manuscript i te reo MÄori, dark type hard to read</Metadata>
             <Metadata mode="accumulate" name="pj.Access">unrestricted</Metadata>
-            <Metadata mode="accumulate" name="pj.PersonOfInterest">Bruce Biggs; Himiona Kamira</Metadata>
+            <Metadata mode="accumulate" name="pj.PersonOfInterest">Bruce Biggs</Metadata>
+<Metadata mode="accumulate" name="pj.PersonOfInterest">Himiona Kamira</Metadata>
             <Metadata mode="accumulate" name="pj.Correspondent">Pei Te Hurinui Jones</Metadata>
         </Description>
@@ -177,22 +187,22 @@
   <Description>
     <Metadata name="Title">4</Metadata>
-    <Metadata name="Image">3C01-01-003.tif</Metadata>
+    <Metadata name="Image">3C01-01-003.png</Metadata>
     <Metadata name="Source">3C01-01-003.tif</Metadata>
     <Metadata name="SourceFile">3C01-01-003.tif</Metadata>
     <Metadata name="FileSize">1233551</Metadata>
-    <Metadata name="ImageType">TIFF</Metadata>
+    <Metadata name="ImageType">PNG</Metadata>
     <Metadata name="ImageWidth">1741</Metadata>
     <Metadata name="ImageHeight">2666</Metadata>
     <Metadata name="ImageSize">1.234MB</Metadata>
-    <Metadata name="srclink_file">3C01-01-003.tif</Metadata>
-    <Metadata name="srclinkFile">3C01-01-003.tif</Metadata>
-    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
-    <Metadata name="ThumbType">gif</Metadata>
-    <Metadata name="Thumb">3C01-01-003_thumb.gif</Metadata>
+    <Metadata name="srclink_file">3C01-01-003.png</Metadata>
+    <Metadata name="srclinkFile">3C01-01-003.png</Metadata>
+    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
+    <Metadata name="ThumbType">png</Metadata>
+    <Metadata name="Thumb">3C01-01-003_thumb.png</Metadata>
     <Metadata name="thumbicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Thumb]&quot; alt=&quot;[Thumb]&quot; width=&quot;[ThumbWidth]&quot; height=&quot;[ThumbHeight]&quot;&gt;</Metadata>
     <Metadata name="ThumbWidth">65</Metadata>
     <Metadata name="ThumbHeight">100</Metadata>
-    <Metadata name="ScreenType">jpeg</Metadata>
-    <Metadata name="Screen">3C01-01-003_screen.jpeg</Metadata>
+    <Metadata name="ScreenType">png</Metadata>
+    <Metadata name="Screen">3C01-01-003_screen.png</Metadata>
     <Metadata name="screenicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Screen]&quot; width=[ScreenWidth] height=[ScreenHeight]&gt;</Metadata>
     <Metadata name="ScreenWidth">327</Metadata>
@@ -209,22 +219,22 @@
   <Description>
     <Metadata name="Title">5</Metadata>
-    <Metadata name="Image">3C01-01-004.tif</Metadata>
+    <Metadata name="Image">3C01-01-004.png</Metadata>
     <Metadata name="Source">3C01-01-004.tif</Metadata>
     <Metadata name="SourceFile">3C01-01-004.tif</Metadata>
     <Metadata name="FileSize">1175745</Metadata>
-    <Metadata name="ImageType">TIFF</Metadata>
+    <Metadata name="ImageType">PNG</Metadata>
     <Metadata name="ImageWidth">1771</Metadata>
     <Metadata name="ImageHeight">2684</Metadata>
     <Metadata name="ImageSize">1.176MB</Metadata>
-    <Metadata name="srclink_file">3C01-01-004.tif</Metadata>
-    <Metadata name="srclinkFile">3C01-01-004.tif</Metadata>
-    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
-    <Metadata name="ThumbType">gif</Metadata>
-    <Metadata name="Thumb">3C01-01-004_thumb.gif</Metadata>
+    <Metadata name="srclink_file">3C01-01-004.png</Metadata>
+    <Metadata name="srclinkFile">3C01-01-004.png</Metadata>
+    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
+    <Metadata name="ThumbType">png</Metadata>
+    <Metadata name="Thumb">3C01-01-004_thumb.png</Metadata>
     <Metadata name="thumbicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Thumb]&quot; alt=&quot;[Thumb]&quot; width=&quot;[ThumbWidth]&quot; height=&quot;[ThumbHeight]&quot;&gt;</Metadata>
     <Metadata name="ThumbWidth">66</Metadata>
     <Metadata name="ThumbHeight">100</Metadata>
-    <Metadata name="ScreenType">jpeg</Metadata>
-    <Metadata name="Screen">3C01-01-004_screen.jpeg</Metadata>
+    <Metadata name="ScreenType">png</Metadata>
+    <Metadata name="Screen">3C01-01-004_screen.png</Metadata>
     <Metadata name="screenicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Screen]&quot; width=[ScreenWidth] height=[ScreenHeight]&gt;</Metadata>
     <Metadata name="ScreenWidth">330</Metadata>
@@ -241,22 +251,22 @@
   <Description>
     <Metadata name="Title">6</Metadata>
-    <Metadata name="Image">3C01-01-005.tif</Metadata>
+    <Metadata name="Image">3C01-01-005.png</Metadata>
     <Metadata name="Source">3C01-01-005.tif</Metadata>
     <Metadata name="SourceFile">3C01-01-005.tif</Metadata>
     <Metadata name="FileSize">1237375</Metadata>
-    <Metadata name="ImageType">TIFF</Metadata>
+    <Metadata name="ImageType">PNG</Metadata>
     <Metadata name="ImageWidth">1728</Metadata>
     <Metadata name="ImageHeight">2657</Metadata>
     <Metadata name="ImageSize">1.237MB</Metadata>
-    <Metadata name="srclink_file">3C01-01-005.tif</Metadata>
-    <Metadata name="srclinkFile">3C01-01-005.tif</Metadata>
-    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
-    <Metadata name="ThumbType">gif</Metadata>
-    <Metadata name="Thumb">3C01-01-005_thumb.gif</Metadata>
+    <Metadata name="srclink_file">3C01-01-005.png</Metadata>
+    <Metadata name="srclinkFile">3C01-01-005.png</Metadata>
+    <Metadata name="srcicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[srclinkFile]&quot; width=&quot;[ImageWidth]&quot; height=&quot;[ImageHeight]&quot;&gt;</Metadata>
+    <Metadata name="ThumbType">png</Metadata>
+    <Metadata name="Thumb">3C01-01-005_thumb.png</Metadata>
     <Metadata name="thumbicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Thumb]&quot; alt=&quot;[Thumb]&quot; width=&quot;[ThumbWidth]&quot; height=&quot;[ThumbHeight]&quot;&gt;</Metadata>
     <Metadata name="ThumbWidth">65</Metadata>
     <Metadata name="ThumbHeight">100</Metadata>
-    <Metadata name="ScreenType">jpeg</Metadata>
-    <Metadata name="Screen">3C01-01-005_screen.jpeg</Metadata>
+    <Metadata name="ScreenType">png</Metadata>
+    <Metadata name="Screen">3C01-01-005_screen.png</Metadata>
     <Metadata name="screenicon">&lt;img src=&quot;_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Screen]&quot; width=[ScreenWidth] height=[ScreenHeight]&gt;</Metadata>
     <Metadata name="ScreenWidth">325</Metadata>
