Merge lp:~jesse-andries/referencer/referencer into lp:referencer

[jesse andries]

Case normalisation issues in ADS-plugin and in adding fields through the Document Properties dialogue, as discussed in comment 8 in bug 1099754)

ADS-plugin: Additional fields and normalised case of the Month field

Normalised case of the fields added through the document properties dialog (see comment 8 in bug 1099754). Also added a check which refuses to create a field that already exists even though there are differences in the case of the field-key. This was done to resolve the following problem: It used to be possible to create different versions (different case of the key) of the same field thus holding different values. These were then only subsequently collapsed (retaining the first appearing version of the field-key with the last appearing value) when hitting the Save button, without warning to the user.

[Mads Chr. Olesen (shiyee)]

review: Approve

=== modified file 'plugins/ads.py'
--- plugins/ads.py	2013-01-20 02:03:38 +0000
+++ plugins/ads.py	2013-02-28 23:15:25 +0000
@@ -55,8 +55,9 @@
 		fields.append (["volume",  get_field(xmldoc, "volume")])
 		fields.append (["issue",  get_field(xmldoc, "issue")])
 		fields.append (["year", get_field(xmldoc, "pubdate").partition(' ')[2]])
-		fields.append (["month", str.lower(get_field(xmldoc, "pubdate").partition(' ')[0])])
+		fields.append (["Month", str.lower(get_field(xmldoc, "pubdate").partition(' ')[0])])
 		fields.append (["Adsurl", xmldoc.getElementsByTagName('url')[-1].childNodes[0].data.encode("utf-8")])
+		fields.append (["Adsbibcode",  get_field(xmldoc, "bibcode")])
 
 		authors = xmldoc.getElementsByTagName('author')
 		authorString = ""

=== modified file 'src/DocumentProperties.C'
--- src/DocumentProperties.C	2012-11-03 09:11:50 +0000
+++ src/DocumentProperties.C	2013-02-28 23:15:25 +0000
@@ -24,6 +24,7 @@
 #include "ThumbnailGenerator.h"
 #include "RefWindow.h"
 
+#include "Utility.h"
 #include "DocumentProperties.h"
 
 
@@ -378,9 +379,31 @@
 	vbox->set_border_width (12);
 
 	if (dialog.run () == Gtk::RESPONSE_ACCEPT) {
-		Gtk::ListStore::iterator row = extrafieldsstore_->append ();
-		(*row)[extrakeycol_] = entry.get_text ();
-		(*row)[extravalcol_] = "";
+
+		Gtk::ListStore::iterator it = extrafieldsstore_->children().begin ();
+		Gtk::ListStore::iterator const end = extrafieldsstore_->children().end ();
+		bool key_isnew = true;
+		for (; it != end; ++it)
+			if (Utility::firstCap ((*it)[extrakeycol_]) == Utility::firstCap (entry.get_text ())) {
+				key_isnew = false;
+			}
+		if ( key_isnew ) {
+			Gtk::ListStore::iterator row = extrafieldsstore_->append ();
+			(*row)[extrakeycol_] = Utility::firstCap (entry.get_text ());
+			(*row)[extravalcol_] = "";
+		} else {
+			Glib::ustring message;
+			message = String::ucompose (
+			"<b><big>%1</big></b>",
+			_("This key already exists.\n"));
+			Gtk::MessageDialog dialog (
+
+			message, true,
+			Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
+
+			dialog.run ();
+
+		}
 	}
 }