Lots of column header improvements

@@ -22,7 +22,7 @@
 <http://www.reportinghub.no/ep/spin/ddr-tables>
       rdf:type owl:Ontology ;
       rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ;
-      owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/spin/rh> ;
+      owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://spinrdf.org/spin> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
 ddr-tables:BitRecord
@@ -418,17 +418,17 @@ ddr-tables:BitRecord
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("""Bit size
-in"""^^xsd:string "Run No."^^xsd:string "Manufacturer"^^xsd:string "Model"^^xsd:string "Hours drilled"^^xsd:string """MD Start
-m"""^^xsd:string """MD end
-m"""^^xsd:string """Hole made
-(last+24H)"""^^xsd:string """Hours drilled
+      rhspin:tableHeaders ("""Bit Size
+in"""^^xsd:string "Run No."^^xsd:string "Manufacturer"^^xsd:string "Model"^^xsd:string "Hours Drilled"^^xsd:string """MD Start
+m"""^^xsd:string """MD End
+m"""^^xsd:string """Hole Made
+(last+24H)"""^^xsd:string """Hours Drilled
 (last24H)"""^^xsd:string """ROP
-m/h"""^^xsd:string """Total hole
-made"""^^xsd:string """Total hours
+m/h"""^^xsd:string """Total Hole
+made"""^^xsd:string """Total Hours
 drilled"""^^xsd:string """Total ROP
 m/h"""^^xsd:string """Dull
-grade"""^^xsd:string) .
+Grade"""^^xsd:string) .
 
 ddr-tables:CasingLinerTubingInformation
       rdf:type rhspin:TableTemplate ;
@@ -734,18 +734,20 @@ ddr-tables:CasingLinerTubingInformation
                           ])
               ] ;
       rhspin:tableHeaders ("""Type of
-pipe"""^^xsd:string """Casing
-type"""^^xsd:string """Start
-time"""^^xsd:string """End
-time"""^^xsd:string """Nominal outside
-diameter in"""^^xsd:string """Nominal inside
-diameter in"""^^xsd:string """Nominal Weight
+Pipe"""^^xsd:string """Casing
+Type"""^^xsd:string """Start
+Time"""^^xsd:string """End
+Time"""^^xsd:string """Nominal Outside
+Diameter
+in"""^^xsd:string """Nominal Inside
+Diameter
+in"""^^xsd:string """Nominal Weight
 lbm/ft"""^^xsd:string """Nominal
 Grade"""^^xsd:string """Nominal
 Connection"""^^xsd:string """Length
 m"""^^xsd:string """MD Top/Hanger
 m"""^^xsd:string """MD Bottom/Shoe
-m"""^^xsd:string "Description"^^xsd:string) .
+m"""^^xsd:string "*Description"^^xsd:string) .
 
 ddr-tables:CementFluidInformation
       rdf:type rhspin:TableTemplate ;
@@ -990,12 +992,12 @@ ddr-tables:CementFluidInformation
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("Fluid type"^^xsd:string """Volume pumped
-m3"""^^xsd:string "Fluid density"^^xsd:string """Yield point
-ft3/sack"""^^xsd:string """Mix water ratio
-gal/sack"""^^xsd:string """Free water
-%"""^^xsd:string """Thickening time
-h"""^^xsd:string "Fluid Description"^^xsd:string "Comments"^^xsd:string) .
+      rhspin:tableHeaders ("Fluid type"^^xsd:string """Volume Pumped
+m3"""^^xsd:string "Fluid Density"^^xsd:string """Yield Point
+ft3/sack"""^^xsd:string """Mix Water Ratio
+gal/sack"""^^xsd:string """Free Water
+%"""^^xsd:string """Thickening Time
+h"""^^xsd:string "*Fluid Description"^^xsd:string "*Comments"^^xsd:string) .
 
 ddr-tables:CementInformation
       rdf:type rhspin:TableTemplate ;
@@ -1441,22 +1443,23 @@ ddr-tables:CementInformation
       rhspin:tableHeaders ("""Start
 Time"""^^xsd:string """End
 Time"""^^xsd:string """Job
-type"""^^xsd:string """Casing string
-diameter
+Yype"""^^xsd:string """Casing String
+Diameter
 in"""^^xsd:string """Top
-plug
-used"""^^xsd:string """Bottom
-plug
-used"""^^xsd:string """Plug
-bumped"""^^xsd:string """Plug bump
-pressure
+Plug
+Used"""^^xsd:string """Bottom
+Plug
+Used"""^^xsd:string """Plug
+Bumped"""^^xsd:string """Plug Bump
+Pressure
 bar"""^^xsd:string """Float
-held"""^^xsd:string """Pressure
-release
-time"""^^xsd:string """Full
-returns"""^^xsd:string """Cement
-volume
-returns m3"""^^xsd:string "Reciprocated"^^xsd:string "Rotated"^^xsd:string "Comments"^^xsd:string) .
+Held"""^^xsd:string """Pressure
+Release
+Time"""^^xsd:string """Full
+Returns"""^^xsd:string """Cement
+Volume
+Returns
+m3"""^^xsd:string "Reciprocated"^^xsd:string "Rotated"^^xsd:string "*Comments"^^xsd:string) .
 
 ddr-tables:CoreInformation
       rdf:type rhspin:TableTemplate ;
@@ -1649,12 +1652,13 @@ ddr-tables:CoreInformation
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("Core no"^^xsd:string """Depth Top
+      rhspin:tableHeaders ("Core No"^^xsd:string """Depth Top
 mMD"""^^xsd:string """Depth Bottom
-mMD"""^^xsd:string """Core length
-m"""^^xsd:string """Recovery core
-%"""^^xsd:string """Core barrel length
-m"""^^xsd:string "Inner barrel type"^^xsd:string "Description"^^xsd:string) .
+mMD"""^^xsd:string """Core Length
+m"""^^xsd:string """Recovery Core
+%"""^^xsd:string """Core Barrel
+Length
+m"""^^xsd:string "Inner Barrel Type"^^xsd:string "*Description"^^xsd:string) .
 
 ddr-tables:DrillingFluidInformation
       rdf:type rhspin:TableTemplate ;
@@ -1838,11 +1842,11 @@ ddr-tables:DrillingFluidInformation
                           ])
               ] ;
       rhspin:tableHeaders ("""Sample
-time"""^^xsd:string """Depth At
+Time"""^^xsd:string """Depth at
 Logging
-mMD"""^^xsd:string "Fluid Type"^^xsd:string """Fluid density
+mMD"""^^xsd:string "Fluid Type"^^xsd:string """Fluid Density
 g/cm3"""^^xsd:string """Fluid Viscosity
-mPa.s"""^^xsd:string """Yield point
+mPa.s"""^^xsd:string """Yield Point
 Pa"""^^xsd:string) .
 
 ddr-tables:EquipmentFailure
@@ -2030,7 +2034,7 @@ mMD"""^^xsd:string """Depth
 mTVD"""^^xsd:string """Sub Equip
 Syst Class"""^^xsd:string """Operation
 Downtime"""^^xsd:string """Equipment
-Repaired"""^^xsd:string "Failure Description"^^xsd:string) .
+Repaired"""^^xsd:string "*Failure Description"^^xsd:string) .
 
 ddr-tables:FormationTest
       rdf:type rhspin:TableTemplate ;
@@ -2240,13 +2244,16 @@ ddr-tables:FormationTest
                           ])
               ] ;
       rhspin:tableHeaders ("""Depth
-mMD"""^^xsd:string """Formation pore
-pressure MPa"""^^xsd:string """Good seal
-ind"""^^xsd:string """Depth to sample point
-m"""^^xsd:string """Dominant fluid
-component"""^^xsd:string """HC Component
-density g/cm3"""^^xsd:string """Sample volume
-dm3"""^^xsd:string "Description"^^xsd:string) .
+mMD"""^^xsd:string """Formation Pore
+Pressure
+MPa"""^^xsd:string """Good Seal
+Ind"""^^xsd:string """Depth to
+Sample Point
+m"""^^xsd:string """Dominant Fluid
+Component"""^^xsd:string """HC Component
+Density
+g/cm3"""^^xsd:string """Sample Volume
+dm3"""^^xsd:string "*Description"^^xsd:string) .
 
 ddr-tables:GasReadingInformation
       rdf:type rhspin:TableTemplate ;
@@ -2670,10 +2677,14 @@ ddr-tables:GasReadingInformation
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("Time"^^xsd:string "Class"^^xsd:string """Depth Top
-mMD"""^^xsd:string """Depth Bottom
-mMD"""^^xsd:string """Depth Top
-mTVD"""^^xsd:string """Depth Bottom
+      rhspin:tableHeaders ("Time"^^xsd:string "Class"^^xsd:string """Depth to
+Top
+mMD"""^^xsd:string """Depth to
+Bottom
+mMD"""^^xsd:string """Depth to
+Top
+mTVD"""^^xsd:string """Depth to
+Bottom
 mTVD"""^^xsd:string """Highest gas
 %"""^^xsd:string """Lowest gas
 %"""^^xsd:string """C1
@@ -2909,13 +2920,17 @@ ddr-tables:LithologyInformation
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("""Start Depth
+      rhspin:tableHeaders ("""Start
+Depth
 mMD"""^^xsd:string """End Depth
-mMD"""^^xsd:string """Difference in Depth
-mMD"""^^xsd:string """Start Depth
+mMD"""^^xsd:string """Difference
+in Depth
+mMD"""^^xsd:string """Start
+Depth
 mTVD"""^^xsd:string """End Depth
-mTVD"""^^xsd:string """Difference in Depth
-mTVD"""^^xsd:string "Shows Description"^^xsd:string "Lithology Description"^^xsd:string) .
+mTVD"""^^xsd:string """Difference
+in Depth
+mTVD"""^^xsd:string "*Shows Description"^^xsd:string "*Lithology Description"^^xsd:string) .
 
 ddr-tables:LogInformation
       rdf:type rhspin:TableTemplate ;
@@ -3116,7 +3131,7 @@ ddr-tables:LogInformation
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("Run no"^^xsd:string """Depth Top
+      rhspin:tableHeaders ("Run No"^^xsd:string """Depth Top
 mMD"""^^xsd:string """Depth Bottom
 mMD"""^^xsd:string "Tool"^^xsd:string """BHCT
 degC"""^^xsd:string """BHST
@@ -3340,10 +3355,12 @@ ddr-tables:Operations
               ] ;
       rhspin:tableHeaders ("""Start
 Time"""^^xsd:string """End
-Time"""^^xsd:string """Start Depth
-mMD"""^^xsd:string """End Depth
+Time"""^^xsd:string """Start
+Depth
+mMD"""^^xsd:string """End
+Depth
 mMD"""^^xsd:string """Depth
-mMD"""^^xsd:string "Main - Sub Activity"^^xsd:string "State"^^xsd:string "Remark"^^xsd:string) .
+mMD"""^^xsd:string "Main - Sub Activity"^^xsd:string "State"^^xsd:string "*Remark"^^xsd:string) .
 
 ddr-tables:PerforationInformation
       rdf:type rhspin:TableTemplate ;
@@ -3351,6 +3368,8 @@ ddr-tables:PerforationInformation
       rdfs:subClassOf rhspin:DDRTableTemplates ;
       spin:body
               [ rdf:type sp:Select ;
+                sp:orderBy ([ sp:varName "timeOfOpeningWellPerf"^^xsd:string
+                          ]) ;
                 sp:resultVariables ([ sp:varName "timeOfOpeningWellPerf"^^xsd:string
                           ] [ sp:varName "timeOfClosingWellPerf"^^xsd:string
                           ] [ sp:varName "durationWellPerf"^^xsd:string
@@ -3539,13 +3558,13 @@ ddr-tables:PerforationInformation
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("""Time of opening
-well perf"""^^xsd:string """Time of closing
-well perf"""^^xsd:string """Duration
-well perf"""^^xsd:string """Top of perf
-mMD"""^^xsd:string """Bottom of perf
-mMD"""^^xsd:string """Top of perf
-mTVD"""^^xsd:string """Bottom of perf
+      rhspin:tableHeaders ("""Time of Opening
+Well Perf"""^^xsd:string """Time of Closing
+Well Perf"""^^xsd:string """Duration
+Well Perf"""^^xsd:string """Top of Perf
+mMD"""^^xsd:string """Bottom of Perf
+mMD"""^^xsd:string """Top of Perf
+mTVD"""^^xsd:string """Bottom of Perf
 mTVD"""^^xsd:string) .
 
 ddr-tables:PorePressure
@@ -3810,9 +3829,11 @@ ddr-tables:StratigraphicInformation
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("""Depth to top of formation
-mMD"""^^xsd:string """Depth to top of formation
-mTVD"""^^xsd:string "Formation name"^^xsd:string) .
+      rhspin:tableHeaders ("""Depth to
+Top of Formation
+mMD"""^^xsd:string """Depth to 
+op of Formation
+mTVD"""^^xsd:string "Formation Name"^^xsd:string) .
 
 ddr-tables:SurveyStation
       rdf:type rhspin:TableTemplate ;
@@ -4359,28 +4380,28 @@ ddr-tables:WellControlIncident
                           ])
               ] ;
       rhspin:tableHeaders ("Date"^^xsd:string """Depth of
-well
+Well
 mMD"""^^xsd:string """Depth of
-well
-mTVD"""^^xsd:string """Lost time
+Well
+mTVD"""^^xsd:string """Lost Time
 min"""^^xsd:string """Time for
-well control
-regain"""^^xsd:string """Depth
-at bit
-mMD"""^^xsd:string """Drilling fluid
-density
+Well Control
+Regain"""^^xsd:string """Depth
+at Bit
+mMD"""^^xsd:string """Drilling Fluid
+Density
 g/cm3"""^^xsd:string """Pore
-pressure
+Pressure
 g/cm3"""^^xsd:string """Depth to
-casing
-mMD"""^^xsd:string """Gained vol
+Casing
+mMD"""^^xsd:string """Gained Vol
 of Fluid"""^^xsd:string """Shut in
-casing pressure
-bar"""^^xsd:string """Shut in drill
-pipe pressure
+Casing Pressure
+bar"""^^xsd:string """Shut in Drill
+Pipe Pressure
 bar"""^^xsd:string """Incident
-class"""^^xsd:string """Killing
-procd"""^^xsd:string "Formation"^^xsd:string "BHT"^^xsd:string) .
+Class"""^^xsd:string """Killing
+Procd"""^^xsd:string "Formation"^^xsd:string "BHT"^^xsd:string) .
 
 ddr-tables:WellTestInformation
       rdf:type rhspin:TableTemplate ;
@@ -4966,34 +4987,35 @@ ddr-tables:WellTestInformation
                           ])
               ] ;
       rhspin:tableHeaders ("Time"^^xsd:string """Test
-no"""^^xsd:string "Type"^^xsd:string """Depth
+No"""^^xsd:string "Type"^^xsd:string """Depth
 Top
 mMD"""^^xsd:string """Depth
 Bottom
 mMD"""^^xsd:string """Choke
-oriface
-Size mm"""^^xsd:string """Density
-crude oil
-g/cm3"""^^xsd:string """Oil flow
-rate
-m3/d"""^^xsd:string """Gas flow
-rate
+Oriface
+Size
+mm"""^^xsd:string """Density
+Crude Oil
+g/cm3"""^^xsd:string """Oil Flow
+Rate
+m3/d"""^^xsd:string """Gas Flow
+Rate
 M(m3)/d"""^^xsd:string """Water
-flow rate
+Flow Rate
 m3/d"""^^xsd:string """Shut in
-pressure
+Pressure
 MPa"""^^xsd:string """Flow
-pressure
-MPa"""^^xsd:string """Bottom hole
-pressure
-MPa"""^^xsd:string """Gas oil
-ratio
-m3/m3"""^^xsd:string """Water oil
-ratio
+Pressure
+MPa"""^^xsd:string """Bottom Hole
+Pressure
+MPa"""^^xsd:string """Gas Oil
+Ratio
+m3/m3"""^^xsd:string """Water Oil
+Ratio
 m3/m3"""^^xsd:string """Chloride
-content
+Content
 ppm"""^^xsd:string """CO2
-content
+Content
 ppm"""^^xsd:string """H2S
-content
+Content
 ppm"""^^xsd:string) .