Move to settee php couchdb library
Former-commit-id: ce7412338f5117d78853985519b77864450eeb37
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
-[submodule "sag"]
- path = sag
- url = https://github.com/sbisbee/sag.git
[submodule "couchdb/couchdb-lucene"]
path = couchdb/couchdb-lucene
url = https://github.com/rnewson/couchdb-lucene.git
+[submodule "couchdb/settee"]
+ path = couchdb/settee
+ url = https://github.com/inadarei/settee.git
--- a/common.inc.php
+++ b/common.inc.php
@@ -1,22 +1,7 @@
<?php
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+function createAgencyDesignDoc() {
-function createAgencyDesignDoc() {
- global $sag;
- //See if the design doc exists, creating it if it doesn't
- try {
- //it does exist, so finish early
- if ($sag->head('_design/app')->headers->_HTTP->status != "404")
- return true;
- } catch (Exception $e) {
- //database issue
- return false;
- }
- $ddoc = new StdClass();
$ddoc->_id = '_design/app';
$ddoc->views = new StdClass();
// by abn, by name
@@ -30,30 +15,12 @@
$ddoc->views->getSuspended->map = 'function(doc) { if (doc.status == "suspended") { emit(doc._id, doc); } };';
$ddoc->views->getScrapeRequired = new StdClass();
$ddoc->views->getScrapeRequired->map = "function(doc) { emit(doc.abn, doc); };";
- try {
- $sag->put('_design/app', $ddoc);
- } catch (Exception $e) {
- /*
- * A 409 status code means there was a conflict, so another client
- * already created the design doc for us. This is fine.
- */
- if ($e->getCode() != 409)
- return false;
- }
+
return true;
}
-error_reporting(0);
-require_once('sag/src/SagException.php');
-require_once('sag/src/SagCouchException.php');
-require_once('sag/src/SagConfigurationCheck.php');
-require_once('sag/src/httpAdapters/SagHTTPAdapter.php');
-require_once('sag/src/httpAdapters/SagNativeHTTPAdapter.php');
-require_once('sag/src/httpAdapters/SagCURLHTTPAdapter.php');
-require_once 'sag/src/Sag.php';
-error_reporting(E_ALL ^ E_STRICT ^ E_NOTICE);
-$sag = new Sag();
+require (realpath(dirname(__FILE__) . '/couchdb/settee/src/settee.php'));
-// createAgencyDesignDoc();
+$server = new SetteeServer('http://127.0.0.1:5984');
function include_header() {
?>
--- /dev/null
+++ b/couchdb/settee
--- a/import.php
+++ b/import.php
@@ -1,7 +1,6 @@
<?php
require_once 'common.inc.php';
-
-$sag->setDatabase("disclosr-agencies", true);
+$db = $server->get_db('disclosr-agencies');
//createAgencyDesignDoc();
$conn = new PDO("pgsql:dbname=contractDashboard;user=postgres;password=snmc;host=localhost");
$namesQ = 'select agency.abn, string_agg("agencyName",\',\') as names from agency inner join agency_nametoabn on agency.abn::text = agency_nametoabn.abn group by agency.abn;';
@@ -16,7 +15,8 @@
if (sizeof($abntonames[$agency['abn']]) == 1) $agency['name'] = $abntonames[$agency['abn']][0];
$agency["lastScraped"] = "1/1/1970";
$agency["scrapeDepth"] = 1;
- $sag->post($agency);
+ $doc = $db->save($agency);
+print_r($doc);
}
?>
directory:
a/sag
(deleted)
--- a/sag
+++ /dev/null