Ticket #1808: Diff-mainichi-translator.patch

translators/Mainichi

@@ -3 +3 @@
         "translatorType":4,
         "label":"Mainichi Daily News",
         "creator":"Frank Bennett",
-        "target":"^http://(?:search\\.)*mdn\\.mainichi\\.jp/(?:$|result\\?|mdnnews/|perspectives/|features/|arts/|travel/)",
+        "target":"^http://(?:search\\.)*(mdn\\.)*mainichi\\.jp/(?:$|result\\?|[a-z][a-z]+)",
         "minVersion":"2.0b7",
         "maxVersion":"",
         "priority":100,
         "inRepository":true,
-        "lastUpdated":"2010-06-05 20:35:00"
+        "lastUpdated":"2011-03-31 20:35:00"
 }
 
 // #################################
 // #### Local utility functions ####
 // #################################
 
-var itemRe = new RegExp('.*/([0-9]{8})[a-z]{1}[0-9]{1}[a-z]{1}[0-9]{2}[a-z]{1}[0-9]{1}[a-z]{2}[0-9]{6}c\.html');
+var itemRe = new RegExp('.*/[a-z]*([0-9]{8})([a-z0-9]+)c\.html');
 
+var searchRe = new RegExp('/result\?');
+
 var getResolver = function (doc) {
         var namespace, resolver;
         namespace = doc.documentElement.namespaceURI;
@@ -49 +51 @@
 // #########################
 
 var detectWeb = function (doc, url) {
-        if (itemRe.test(doc.location.href)) {
-                return "newspaperArticle";
-        } else {
+        if (itemRe.test(url)) {
+                var news = doc.getElementsByClassName("NewsBody");
+                if (news && news.length) {
+                        return "newspaperArticle";
+                }
+        } else if (searchRe.test(url)) {
                 return "multiple";
         }
 }
@@ -83 +88 @@
                         items = Zotero.selectItems(availableItems);
                         for (myurl in items) {
                                 if (items.hasOwnProperty(myurl)) {
-                                        scrapeAndParse(myurl, availableItems[myurl]);
+                                        scrapeAndParse(doc, availableItems[myurl]);
                                 }
                         }
                 }
@@ -93 +98 @@
                 title = nodes.iterateNext();
                 if (title) {
                         title = cleanUp(title.textContent);
-                        scrapeAndParse(url, title);
+                        scrapeAndParse(doc, title);
                 }
         }
 };
@@ -102 +107 @@
 // ##### Scraper function #####
 // ############################
 
-var scrapeAndParse = function (url, title) {
+var scrapeAndParse = function (doc, title) {
         var item, mytxt, m, val;
         item = new Zotero.Item("newspaperArticle");
         item.title = title;
         item.publicationTitle = "Mainichi Daily News";
         item.edition = "online edition";
-        item.url = url;
-        m = itemRe.exec(url);
+        item.url = doc.location.href;
+
+        var date = "";
+        m = item.url.match(itemRe);
         if (m) {
                 var year = m[1].slice(0,4);
                 var month = m[1].slice(4,6);
                 var day = m[1].slice(6,8);
-                item.date = [year, month, day].join("-");
+                var date = [year, month, day].join("-");
+                item.date = date;
+                date = ", " + date;
         }
-        item.attachments.push({title:"Mainichi Daily News snapshot", mimeType:"text/html", url:url});
+
+        // Use DOM methods to grab elements and wrap in a new document.
+        var newDoc = false;
+        var label = "Mainichi Shimbun content" + date
+        var article = doc.getElementsByClassName("NewsArticle");
+        if (article && article.length) {
+                newDoc = Zotero.Utilities.composeDOM(doc, label, article);
+        } else {
+                var title = doc.getElementsByClassName("NewsTitle");
+                var body = doc.getElementsByClassName("NewsBody");
+                newDoc = Zotero.Utilities.composeDOM(doc, label, [title, body]);
+        }
+        if (newDoc) {
+                item.attachments.push({
+                                title: "Mainichi article content",
+                                document:newDoc,
+                                snapshot: true
+        });
+        }
         item.complete();
 };