Merge branch 'master' of /u/ijackson/things/ypp-sc-tools.pctb-dict

diff --git a/yarrg/CommodsDatabase.pm b/yarrg/CommodsDatabase.pm
index 999dda779611b441e2131348e4b6efa5acce0228..f704f1241b90495b05eb120066bc52259b403030 100644 (file)
--- a/yarrg/CommodsDatabase.pm
+++ b/yarrg/CommodsDatabase.pm
@@ -67,7 +67,7 @@ sub db_connect_core ($) {
     my $h= DBI->connect("dbi:SQLite:$fn",'','',
                       { AutoCommit=>0,
                         RaiseError=>1, ShowErrorStatement=>1,
-                        unicode=>1 })
+                        sqlite_unicode=>1 })
        or die "$fn $DBI::errstr ?";
     return $h;
     # default timeout is 30s which is plenty

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index fdd5125739959c0341fe82289c35417bd0a0d318..7a6c21ce633cfcb64670f996226ae2b5c682479a 100644 (file)
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -143,6 +143,7 @@ commods
  lapis lazuli                                                  @200000+
  quartz                                                                @200000+
  tigereye                                                      @200000+
+ topaz                                                         @200000+
 
 commods
  swill                 1kg             *ship_supplies          @0+
@@ -210,45 +211,20 @@ client jpctb greenend
 #---------- OCEANS ----------
 # subscriber oceans
 
-ocean Midnight
-
-ocean Cobalt
- Garnet
-  Jubilee Island
-
 ocean Cerulean
  Garnet
   Jubilee Island
 
-ocean Ice
- Vilya
-  Winking Wall Island
-
 # doubloon oceans
 
-ocean Hunter
- Eagle
-  Ix Chel
-  Manu Island
-
 ocean Emerald
  Crab
   The Beaufort Islands
  Osprey
   Scurvy Reef
   Gauntlet Island
-
-ocean Malachite
- Draco
-  Cetus Island
-  Threewood Island
-
-ocean Sage
- Osprey
-  Scurvy Reef
-  Gauntlet Island
-
-ocean Viridian
+ Pleiades
+  Morgana Island
 
 ocean Meridian
  Draco
@@ -260,10 +236,6 @@ ocean Meridian
  Komodo
   Buyan's Vortice
 
-# family oceans
-
-ocean Crimson
-
 # International oceans (doubloon oceans)
 
 #ocean Jade
@@ -278,3 +250,8 @@ ocean Crimson
 # Canis
 #  Atchafalaya-Insel
 
+# Test ocean
+
+ocean Ice
+ Vilya
+  Winking Wall Island