Merge pull request #116 from UMiamiLibraries/development

Development
UMiamiLibraries · Jun 22, 2016 · 5b4b529 · 5b4b529
2 parents 229a920 + ef3e6ce
commit 5b4b529
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 59 deletions.
diff --git a/conf/db.php b/conf/db.php
@@ -1,6 +1,6 @@
 <?php
 $db_host = '127.0.0.1';
 $db_user = 'root';
-$db_pass = '';
+$db_pass = 'root';
 $db_default = 'ead_eac';
-$db_port = '3306';
+$db_port = '3306';
diff --git a/header.php b/header.php
@@ -23,8 +23,8 @@
     <link rel="stylesheet" type="text/css" href="style/select2-skins.css">
 
     <!-- Pure, Font Awesome, Lato Font -->
-    <link rel="stylesheet" href="style/pure-min.css">
-    <link rel="stylesheet" href="style/grids-responsive-min.css">
+    <link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.6.0/pure-min.css">
+    <link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.6.0/grids-responsive-min.css">
     <link rel="stylesheet" href="style/font-awesome.min.css">
     <link href='https://fonts.googleapis.com/css?family=Lato:400,900italic,900,700italic,700,400italic,300italic,300' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" type="text/css" href="style/main.css"/>

diff --git a/lib/RAMP/Ingest/IngestStatus.php b/lib/RAMP/Ingest/IngestStatus.php
@@ -28,33 +28,30 @@ public function __construct($eac_id, Database $db)
         $db = Database::getInstance();
         $mysqli = $db->getConnection();
 
-        try {
-            $statement = $mysqli->prepare("SELECT eac_xml FROM eac WHERE eac_id = ?");
-            $statement->bind_param("s", $eac_id);
-            $statement->execute();
-            $statement->bind_result($result);
-            $statement->fetch();
-            $this->eac_xml_string = $result;
-            $this->eac_xml_dom = simplexml_load_string($result);
-            $this->eac_xml_dom->registerXPathNamespace('eac', 'urn:isbn:1-931666-33-4');
-
-            $statement->close();
-
-            $wiki_stmt = $mysqli->prepare("SELECT wiki_text FROM mediawiki WHERE eac_id = ?");
-            $wiki_stmt->bind_param("s", $eac_id);
-            $wiki_stmt->execute();
-            $wiki_stmt->bind_result($result);
-            $wiki_stmt->fetch();
-            $wiki_stmt->close();
-
-            if ($result != null) {
-                $this->wiki_status = 'true';
-            } else {
-                $this->wiki_status = 'false';
-            }
-
-        } catch (\Exception $e) {
-
+        $statement = $mysqli->prepare("SELECT eac_xml FROM ead_eac.eac WHERE eac_id = ?");
+        $statement->bind_param("s", $eac_id);
+        $statement->execute();
+        $statement->bind_result($result);
+        $statement->fetch();
+        $this->eac_xml_string = $result;
+        $this->eac_xml_dom = simplexml_load_string($result);
+        $this->eac_xml_dom->registerXPathNamespace('eac', 'urn:isbn:1-931666-33-4');
+
+        $statement->close();
+
+        $wiki_stmt = $mysqli->prepare("SELECT wiki_text FROM ead_eac.mediawiki WHERE eac_id = ?");
+        $wiki_stmt->bind_param("s", $eac_id);
+        $wiki_stmt->execute();
+        $wiki_stmt->bind_result($result);
+        $wiki_stmt->fetch();
+        $wiki_stmt->close();
+
+        if ($result != null) {
+            $this->wiki_status = 'true';
+        } else {
+            $this->wiki_status = 'false';
+
+
         }
     }
 

diff --git a/lib/RAMP/Wiki/Wikiator.php b/lib/RAMP/Wiki/Wikiator.php
@@ -404,10 +404,9 @@ private function setupCurl()
 	 */
 	static function encodeForUrl($lstrString)
 	{
-		$lstrString = preg_replace('/\s\s+/', " ", $lstrString );
-		$lstrString = rawurlencode(utf8_decode($lstrString));
 
-		return $lstrString;
+
+		return urlencode(trim($lstrString));
 	}
 
 	/**

diff --git a/script/eac_editor.js b/script/eac_editor.js
@@ -290,11 +290,6 @@ function Ead()
 			lobjAttributes["cpfRelationType"] = lobjRels;
 		}
 
-		if ( lobjAttributes["xlink:type"] == '' )
-		{
-			lobjAttributes["xlink:type"] = "simple";
-		}
-
 		var lobjCPFRelationNode = this.createElement( 'cpfRelation', lobjAttributes, lobjElements );		
 
 		if( this.doesElementExist('//*[local-name()=\'cpfDescription\']/*[local-name()=\'relations\']/*[local-name()=\'resourceRelation\']') )

diff --git a/script/ingest_wiki.js b/script/ingest_wiki.js
@@ -297,14 +297,14 @@ function getLocalWikiMarkup(eacId) {
 
 function autoSearchWikipedia(entityName) {
 
-    lstrUserSearch = encode_utf8(entityName);
+    var lstrUserSearch = entityName;
 
     showLoadingImage();
 
     //post to ajax wiki controller to search wiki and get results
     $.post('ajax/wiki_api.php', {'action': 'search', 'title': lstrUserSearch}, function (response) {
         try {
-            lobjData = JSON.parse(response);
+            var lobjData = JSON.parse(response);
         }
         catch (e) {
             renderFlashMessage('<p>' + e.message + '</p>');

diff --git a/style/grids-responsive-min.css b/style/grids-responsive-min.css
diff --git a/style/pure-min.css b/style/pure-min.css