Removed abstract-as-note functionality in favor of a regular 'abstract' field

Abstract displays in metadata pane as a cropped one-line field by default; clicking the 'Abstract' label toggles between the cropped field and an expanded view

Some problems with import/export: https://www.zotero.org/trac/ticket/537

Refs #537

chrome/content/zotero/itemPane.js

@@ -62,6 +62,7 @@ var ZoteroItemPane = new function()
 	this.onOpenURLClick = onOpenURLClick;
 	this.addCreatorRow = addCreatorRow;
 	this.switchCreatorMode = switchCreatorMode;
+	this.toggleAbstractExpand = toggleAbstractExpand;
 	this.disableButton = disableButton;
 	this.createValueElement = createValueElement;
 	this.removeCreator = removeCreator;
@@ -309,8 +310,11 @@ var ZoteroItemPane = new function()
 					label.setAttribute("onclick", "ZoteroPane.loadURI(this.nextSibling.value, event)");
 					label.setAttribute("tooltiptext", Zotero.getString('pane.item.goToURL.online.tooltip'));
 				}
+				else if (fieldNames[i] == 'abstract') {
+					label.setAttribute("onclick", "if (this.nextSibling.inputField) { this.nextSibling.inputField.blur(); } else { ZoteroItemPane.toggleAbstractExpand(this); }");
+				}
 				else {
-					label.setAttribute("onclick","this.nextSibling.blur();");
+					label.setAttribute("onclick", "if (this.nextSibling.inputField) { this.nextSibling.inputField.blur(); }");
 				}
 			
 				addDynamicRow(label,valueElement);
@@ -349,11 +353,7 @@ var ZoteroItemPane = new function()
 				for(var i = 0; i < notes.length; i++)
 				{
 					var icon = document.createElement('image');
-					var iconType = 'treeitem-note';
-					if (notes[i].isAbstract()) {
-						iconType += '-abstract';
-					}
-					icon.setAttribute('src','chrome://zotero/skin/' + iconType + '.png');
+					icon.setAttribute('src','chrome://zotero/skin/treeitem-note.png');
 				
 					var label = document.createElement('label');
 					label.setAttribute('value',_noteToTitle(notes[i].getNote()));
@@ -825,6 +825,19 @@ var ZoteroItemPane = new function()
 		}
 	}
 	
+	
+	function toggleAbstractExpand(label) {
+		var cur = Zotero.Prefs.get('lastAbstractExpand');
+		Zotero.Prefs.set('lastAbstractExpand', !cur);
+		
+		var ab = label.nextSibling;
+		var valueText = _itemBeingEdited.getField('abstract');
+		var tabindex = ab.getAttribute('ztabindex');
+		var elem = createValueElement(valueText, 'abstract', tabindex);
+		ab.parentNode.replaceChild(elem, ab);
+	}
+	
+	
 	function disableButton(button)
 	{
 		button.setAttribute('disabled', true);
@@ -840,8 +853,10 @@ var ZoteroItemPane = new function()
 	
 	function createValueElement(valueText, fieldName, tabindex, noedit)
 	{
-		if (fieldName=='extra')
-		{
+		var abstractAsVbox = (fieldName == 'abstract') &&
+			Zotero.Prefs.get('lastAbstractExpand');
+		
+		if (fieldName == 'extra' || abstractAsVbox) {
 			var valueElement = document.createElement("vbox");
 		}
 		else
@@ -895,8 +910,7 @@ var ZoteroItemPane = new function()
 		
 		// To support newlines in 'extra' fields, we use multiple
 		// <description> elements inside a vbox
-		if (fieldName=='extra')
-		{
+		if (fieldName == 'extra' || abstractAsVbox) {
 			var lines = valueText.split("\n");
 			for (var i = 0; i < lines.length; i++) {
 				var descriptionNode = document.createElement("description");
@@ -905,10 +919,13 @@ var ZoteroItemPane = new function()
 				valueElement.appendChild(descriptionNode);
 			}
 		}
-		// 29 == arbitary length at which to chop uninterrupted text
+		// 29 == arbitrary length at which to chop uninterrupted text
 		else if ((firstSpace == -1 && valueText.length > 29 ) || firstSpace > 29
-			|| (fieldName && fieldName.substr(0, 7)=='creator'))
-		{
+			|| (fieldName &&
+				(fieldName.substr(0, 7) == 'creator') || fieldName == 'abstract')) {
+			if (fieldName == 'abstract') {
+				valueText = valueText.replace(/[\t\n]/g, ' ');
+			}
 			valueElement.setAttribute('crop', 'end');
 			valueElement.setAttribute('value',valueText);
 		}
@@ -990,7 +1007,7 @@ var ZoteroItemPane = new function()
 			t.setAttribute('singleField', elem.getAttribute('singleField'));
 		}
 		
-		if (fieldName=='extra')
+		if (fieldName == 'abstract' || fieldName == 'extra')
 		{
 			t.setAttribute('multiline', true);
 			t.setAttribute('rows', 8);
@@ -1094,28 +1111,30 @@ var ZoteroItemPane = new function()
 	}
 	
 	function handleKeyPress(event){
-		var target = document.commandDispatcher.focusedElement;
+		var target = event.target;
+		var focused = document.commandDispatcher.focusedElement;
+		
 		switch (event.keyCode)
 		{
 			case event.DOM_VK_RETURN:
-				// Use shift-enter as the save action for the 'extra' field
-				if (target.parentNode.parentNode.getAttribute('fieldname')=='extra'
+				// Use shift-enter as the save action for the larger fields
+				if ((target.getAttribute('fieldname') == 'abstract'
+					|| target.getAttribute('fieldname') == 'extra')
 					&& !event.shiftKey)
 				{
 					break;
 				}
-				else if (target.parentNode.parentNode.
-					parentNode.getAttribute('fieldname')=='tag')
+				else if (target.getAttribute('fieldname')=='tag')
 				{
 					// If last tag row, create new one
-					var row = target.parentNode.parentNode.parentNode.parentNode;
+					var row = target.parentNode.parentNode;
 					if (row == row.parentNode.lastChild)
 					{
 						_tabDirection = 1;
 						var lastTag = true;
 					}
 				}
-				target.blur();
+				focused.blur();
 				
 				// Return focus to items pane
 				if (!lastTag) {
@@ -1130,7 +1149,7 @@ var ZoteroItemPane = new function()
 			case event.DOM_VK_ESCAPE:
 				// Reset field to original value
 				target.value = target.getAttribute('value');
-				target.blur();
+				focused.blur();
 				
 				// Return focus to items pane
 				var tree = document.getElementById('zotero-items-tree');
@@ -1144,7 +1163,7 @@ var ZoteroItemPane = new function()
 				_tabDirection = event.shiftKey ? -1 : 1;
 				// Blur the old manually -- not sure why this is necessary,
 				// but it prevents an immediate blur() on the next tag
-				target.blur();
+				focused.blur();
 				return false;
 		}
 		

chrome/content/zotero/note.js

@@ -42,10 +42,6 @@ function onLoad()
 	var id = params['id'];
 	var collectionID = params['coll'];
 	
-	if (params['abstract']) {
-		noteEditor.setAttribute('abstract', true);
-	}
-	
 	if(id && id != '' && id != 'undefined')
 	{
 		var ref = Zotero.Items.get(id);

chrome/content/zotero/overlay.js

@@ -68,7 +68,6 @@ var ZoteroPane = new function()
 	this.clearItemsPaneMessage = clearItemsPaneMessage;
 	this.contextPopupShowing = contextPopupShowing;
 	this.openNoteWindow = openNoteWindow;
-	this.toggleAbstractForSelectedItem = toggleAbstractForSelectedItem
 	this.newNote = newNote;
 	this.addTextToNote = addTextToNote;
 	this.addItemFromPage = addItemFromPage;
@@ -539,7 +538,6 @@ var ZoteroPane = new function()
 				{
 					document.getElementById('zotero-view-note-button').removeAttribute('sourceID');
 				}
-				document.getElementById('zotero-note-editor').setAttribute('abstract', item.ref.isAbstract());
 				document.getElementById('zotero-item-pane-content').selectedIndex = 2;
 			}
 			else if(item.isAttachment())
@@ -1052,14 +1050,13 @@ var ZoteroPane = new function()
 			addNote: 2,
 			attachSnapshot: 3,
 			attachLink: 4,
-			toggleAbstract: 5,
-			sep2: 6,
-			deleteItem: 7,
-			deleteFromLibrary: 8,
-			sep3: 9,
-			exportItems: 10,
-			createBib: 11,
-			loadReport: 12
+			sep2: 5,
+			deleteItem: 6,
+			deleteFromLibrary: 7,
+			sep3: 8,
+			exportItems: 9,
+			createBib: 10,
+			loadReport: 11
 		};
 		
 		var menu = document.getElementById('zotero-itemmenu');
@@ -1074,7 +1071,7 @@ var ZoteroPane = new function()
 			if (this.itemsView.selection.count > 1) {
 				var multiple =  '.multiple';
 				hide.push(m.showInLibrary, m.sep1, m.addNote, m.attachSnapshot,
-					m.attachLink, m.toggleAbstract, m.sep2);
+					m.attachLink, m.sep2);
 			}
 			// Single item selected
 			else
@@ -1094,25 +1091,10 @@ var ZoteroPane = new function()
 				if (item.isRegularItem())
 				{
 					show.push(m.addNote, m.attachSnapshot, m.attachLink, m.sep2);
-					hide.push(m.toggleAbstract);
 				}
 				else
 				{
-					hide.push(m.addNote, m.attachSnapshot, m.attachLink);
-					
-					// Abstract
-					if (item.isNote() && item.getSource()) {
-						show.push(m.toggleAbstract, m.sep2);
-						if (item.isAbstract()) {
-							menu.childNodes[m.toggleAbstract].setAttribute('label', Zotero.getString('pane.items.menu.abstract.unset'));
-						}
-						else {
-							menu.childNodes[m.toggleAbstract].setAttribute('label', Zotero.getString('pane.items.menu.abstract.set'));
-						}
-					}
-					else {
-						hide.push(m.toggleAbstract, m.sep2);
-					}
+					hide.push(m.addNote, m.attachSnapshot, m.attachLink, m.sep2);
 				}
 			}
 		}
@@ -1128,7 +1110,7 @@ var ZoteroPane = new function()
 			
 			disable.push(m.showInLibrary, m.deleteItem, m.deleteFromLibrary,
 				m.exportItems, m.createBib, m.loadReport);
-			hide.push(m.addNote, m.attachSnapshot, m.attachLink, m.toggleAbstract, m.sep2);
+			hide.push(m.addNote, m.attachSnapshot, m.attachLink, m.sep2);
 		}
 		
 		// Remove from collection
@@ -1388,28 +1370,12 @@ var ZoteroPane = new function()
 		if (id) {
 			var item = Zotero.Items.get(id)
 		}
-		if (item) {
-			var isAbstract = item.isAbstract();
-		}
-		window.open('chrome://zotero/content/note.xul?v=1' + (id ? '&id=' + id : '')
-			+ (parent ? '&coll=' + parent : '') + (isAbstract ? '&abstract=1' : ''),
+		window.open('chrome://zotero/content/note.xul?v=1'
+			+ (id ? '&id=' + id : '') + (parent ? '&coll=' + parent : ''),
 			'', 'chrome,resizable,centerscreen');
 	}
 	
 	
-	function toggleAbstractForSelectedItem() {
-		var items = this.getSelectedItems();
-		if (this.itemsView.selection.count == 1 && items[0] && items[0].isNote()
-				&& items[0].getSource()) {
-			
-			items[0].setAbstract(!items[0].isAbstract())
-			return true;
-		}
-		
-		return false;
-	}
-	
-	
 	function addAttachmentFromDialog(link, id)
 	{
 		var nsIFilePicker = Components.interfaces.nsIFilePicker;

chrome/content/zotero/overlay.xul

@@ -89,7 +89,6 @@
 					<menuitem label="&zotero.items.menu.attach.note;" oncommand="ZoteroPane.newNote(false, this.parentNode.getAttribute('itemID'))"/>
 					<menuitem label="&zotero.items.menu.attach.snapshot;" oncommand="ZoteroPane.addAttachmentFromPage(false, this.parentNode.getAttribute('itemID'));"/>
 					<menuitem label="&zotero.items.menu.attach.link;" oncommand="ZoteroPane.addAttachmentFromPage(true, this.parentNode.getAttribute('itemID'));"/>
-					<menuitem oncommand="ZoteroPane.toggleAbstractForSelectedItem()"/>
 					<menuseparator/>
 					<menuitem oncommand="ZoteroPane.deleteSelectedItem();"/>
 					<menuitem oncommand="ZoteroPane.deleteSelectedItem(true);"/>

chrome/content/zotero/xpcom/data_access.js

@@ -50,7 +50,6 @@ Zotero.Item.prototype._init = function(){
 	this._changedItemData = new Zotero.Hash();
 	
 	this._noteText = null;
-	this._noteIsAbstract = null
 	this._noteAccessTime = null;
 	
 	this._fileLinkMode = null;
@@ -1032,9 +1031,9 @@ Zotero.Item.prototype.updateNote = function(text){
 	
 	if (sourceItemID)
 	{
-		var sql = "REPLACE INTO itemNotes (note, sourceItemID, itemID, isAbstract) "
-			+ "VALUES (?,?,?,?)";
-		var bindParams = [{string:text}, sourceItemID, this.getID(), this.isAbstract() ? 1 : null];
+		var sql = "REPLACE INTO itemNotes (note, sourceItemID, itemID) "
+			+ "VALUES (?,?,?)";
+		var bindParams = [{string:text}, sourceItemID, this.getID()];
 	}
 	else
 	{
@@ -1046,7 +1045,7 @@ Zotero.Item.prototype.updateNote = function(text){
 	if (updated){
 		this.updateDateModified();
 		Zotero.DB.commitTransaction();
-		this.updateNoteCache(text, this.isAbstract());
+		this.updateNoteCache(text);
 		
 		Zotero.Notifier.trigger('modify', 'item', this.getID(), { old: preItemArray });
 	}
@@ -1056,11 +1055,10 @@ Zotero.Item.prototype.updateNote = function(text){
 }
 
 
-Zotero.Item.prototype.updateNoteCache = function(text, isAbstract){
+Zotero.Item.prototype.updateNoteCache = function(text){
 	// Update cached values
 	this._noteText = text ? text : '';
 	if (this.isNote()){
-		this._noteIsAbstract = !!isAbstract;
 		this.setField('title', this._noteToTitle(), true);
 	}
 }
@@ -1132,14 +1130,6 @@ Zotero.Item.prototype.setSource = function(sourceItemID){
 		}
 	}
 	
-	if (this.isAbstract()) {
-		// If making an independent note or if new item already has an
-		// abstract, clear abstract status
-		if (!sourceItemID || newItem.getAbstract()) {
-			this.setAbstract(false);
-		}
-	}
-	
 	var sql = "UPDATE item" + Type + "s SET sourceItemID=? WHERE itemID=?";
 	var bindParams = [sourceItemID ? {int:sourceItemID} : null, this.getID()];
 	Zotero.DB.query(sql, bindParams);
@@ -1248,107 +1238,11 @@ Zotero.Item.prototype.getNotes = function(){
 	}
 	
 	var sql = "SELECT itemID FROM itemNotes NATURAL JOIN items "
-		+ "WHERE sourceItemID=" + this.getID() + " ORDER BY isAbstract IS NULL, dateAdded";
+		+ "WHERE sourceItemID=" + this.getID() + " ORDER BY dateAdded";
 	return Zotero.DB.columnQuery(sql);
 }
 
 
-/*
- * Return true if a note item is an abstract, false otherwise
- */
-Zotero.Item.prototype.isAbstract = function() {
-	if (!this.isNote()) {
-		return false;
-	}
-	
-	if (!this.getID()) {
-		throw ("Cannot call isAbstract() on unsaved item");
-	}
-	
-	if (this._noteIsAbstract !== null) {
-		return this._noteIsAbstract;
-	}
-	
-	var sql = "SELECT isAbstract FROM itemNotes WHERE itemID=?";
-	var isAbstract = !!Zotero.DB.valueQuery(sql, this.getID());
-	
-	this._noteIsAbstract = isAbstract;
-	return isAbstract;
-}
-
-
-/*
- * Make a note item an abstract or clear abstract status
- */
-Zotero.Item.prototype.setAbstract = function(set) {
-	if (!this.isNote()) {
-		throw ("setAbstract() can only be called on note items");
-	}
-	
-	if (!this.getID()) {
-		throw ("Cannot call setAbstract() on unsaved item");
-	}
-	
-	if (!!set == !!this.isAbstract()) {
-		Zotero.debug('Abstract status has not changed', 4);
-		return;
-	}
-	
-	Zotero.DB.beginTransaction();
-	
-	var sourceItemID = this.getSource();
-	
-	if (!sourceItemID) {
-		Zotero.DB.rollbackTransaction();
-		throw ("Cannot make a non-child note an abstract");
-	}
-	
-	var notifierData = [{ old: this.toArray() }];
-	
-	var sourceItem = Zotero.Items.get(sourceItemID);
-	notifierData.push({ old: sourceItem.toArray() });
-	
-	// If existing abstract, clear it
-	if (set) {
-		var oldAbstractID = sourceItem.getAbstract();
-		if (oldAbstractID) {
-			var oldAbstractItem = Zotero.Items.get(oldAbstractID);
-			oldAbstractItem.setAbstract(false);
-		}
-	}
-	
-	var sql = "UPDATE itemNotes SET isAbstract=NULL WHERE sourceItemID=?";
-	Zotero.DB.query(sql, sourceItemID);
-	
-	var sql = "UPDATE itemNotes SET isAbstract=? WHERE itemID=?";
-	Zotero.DB.valueQuery(sql, [set ? 1 : null, this.getID()]);
-	
-	this.removeAllRelated();
-	this.removeAllTags();
-	
-	Zotero.DB.commitTransaction();
-	
-	this._noteIsAbstract = !!set;
-	
-	Zotero.Notifier.trigger('modify', 'item', [this.getID(), sourceItemID], notifierData);
-}
-
-
-/*
- * Return the itemID of a parent item's abstract note, or false if none
- */
-Zotero.Item.prototype.getAbstract = function() {
-	if (!this.isRegularItem()) {
-		throw ("getAbstract() can only be called on regular items");
-	}
-	
-	if (!this.getID()) {
-		throw ("Cannot call getAbstract() on unsaved item");
-	}
-	
-	var sql = "SELECT itemID FROM itemNotes WHERE sourceItemID=? AND isAbstract=1";
-	return Zotero.DB.valueQuery(sql, this.getID());
-}
 
 
 
@@ -1652,10 +1546,6 @@ Zotero.Item.prototype.addTag = function(tag, type){
 		throw ('Cannot add tag to unsaved item in Item.addTag()');
 	}
 	
-	if (this.isAbstract()) {
-		throw ('Cannot add tag to abstract note');
-	}
-	
 	if (!tag){
 		Zotero.debug('Not saving empty tag in Item.addTag()', 2);
 		return false;
@@ -1707,10 +1597,6 @@ Zotero.Item.prototype.addTagByID = function(tagID) {
 		throw ('Cannot add tag to unsaved item in Item.addTagByID()');
 	}
 	
-	if (this.isAbstract()) {
-		throw ('Cannot add tag to abstract note');
-	}
-	
 	if (!tagID) {
 		Zotero.debug('Not saving nonexistent tag in Item.addTagByID()', 2);
 		return false;
@@ -1835,10 +1721,6 @@ Zotero.Item.prototype.addSeeAlso = function(itemID){
 		return false;
 	}
 	
-	if (this.isAbstract()) {
-		throw ('Cannot add Related item to abstract note');
-	}
-	
 	Zotero.DB.beginTransaction();
 	
 	var relatedItem = Zotero.Items.get(itemID);
@@ -1951,10 +1833,6 @@ Zotero.Item.prototype.getImageSrc = function() {
 		}
 	}
 	
-	if (itemType == 'note' && this.isAbstract()) {
-		itemType = 'note-abstract';
-	}
-	
 	return Zotero.ItemTypes.getImageSrc(itemType);
 }
 
@@ -2151,6 +2029,12 @@ Zotero.Item.prototype.toArray = function(){
 				arr['itemType'] = Zotero.ItemTypes.getName(this._data[i]);
 				break;
 			
+			// Since 'abstract' is a reserved word in JS, we use abstractNote
+			// instead so clients can use dot notation
+			case 'abstract':
+				arr['abstractNote'] = this._data[i];
+				continue;
+			
 			// Skip certain fields
 			//case 'firstCreator':
 			case 'numNotes':
@@ -2193,7 +2077,6 @@ Zotero.Item.prototype.toArray = function(){
 	if (this.isNote()) {
 		// Don't need title for notes
 		delete arr['title'];
-		arr['isAbstract'] = this.isAbstract();
 		arr['note'] = this.getNote();
 		if (this.getSource()){
 			arr['sourceItemID'] = this.getSource();
@@ -2564,7 +2447,7 @@ Zotero.Notes = new function(){
 	*
 	* Returns the itemID of the new note item
 	**/
-	function add(text, sourceItemID, isAbstract){
+	function add(text, sourceItemID){
 		Zotero.DB.beginTransaction();
 		
 		if (sourceItemID){
@@ -2579,32 +2462,21 @@ Zotero.Notes = new function(){
 			}
 		}
 		
-		// If creating abstract, clear abstract status of existing abstract
-		// for source item
-		if (isAbstract && sourceItemID) {
-			var oldAbstractID = Zotero.Items.get(sourceItemID).getAbstract();
-			if (oldAbstractID) {
-				var oldAbstractItem = Zotero.Items.get(oldAbstractID);
-				oldAbstractItem.setAbstract(false);
-			}
-		}
-		
 		var note = Zotero.Items.getNewItemByType(Zotero.ItemTypes.getID('note'));
 		note.save();
 		
-		var sql = "INSERT INTO itemNotes VALUES (?,?,?,?)";
+		var sql = "INSERT INTO itemNotes VALUES (?,?,?)";
 		var bindParams = [
 			note.getID(),
 			(sourceItemID ? {int:sourceItemID} : null),
-			{string: text ? text : ''},
-			isAbstract ? 1 : null,
+			{string: text ? text : ''}
 		];
 		Zotero.DB.query(sql, bindParams);
 		Zotero.DB.commitTransaction();
 		
 		// Switch to Zotero.Items version
 		var note = Zotero.Items.get(note.getID());
-		note.updateNoteCache(text, isAbstract);
+		note.updateNoteCache(text);
 		
 		if (sourceItemID){
 			var notifierData = { old: sourceItem.toArray() };
@@ -3879,7 +3751,6 @@ Zotero.ItemTypes = new function(){
 			case 'map':
 			case 'newspaperArticle':
 			case 'note':
-			case 'note-abstract':
 			case 'podcast':
 			case 'radioBroadcast':
 			case 'report':

chrome/content/zotero/xpcom/schema.js

@@ -749,6 +749,18 @@ Zotero.Schema = new function(){
 				if (i==17) {
 					Zotero.DB.query("UPDATE itemData SET fieldID=89 WHERE fieldID=8 AND itemID IN (SELECT itemID FROM items WHERE itemTypeID=7)");
 				}
+				
+				if (i==19) {
+					Zotero.DB.query("INSERT INTO itemData SELECT sourceItemID, 90, note FROM itemNotes WHERE isAbstract=1");
+					Zotero.DB.query("DELETE FROM items WHERE itemID IN (SELECT itemID FROM itemNotes WHERE isAbstract=1)");
+					Zotero.DB.query("DELETE FROM itemData WHERE itemID IN (SELECT itemID FROM itemNotes WHERE isAbstract=1)");
+					Zotero.DB.query("CREATE TEMPORARY TABLE itemNotesTemp (itemID INT, sourceItemID INT, note TEXT)");
+					Zotero.DB.query("INSERT INTO itemNotesTemp SELECT itemID, sourceItemID, note FROM itemNotes WHERE isAbstract IS NULL");
+					Zotero.DB.query("DROP TABLE itemNotes");
+					Zotero.DB.query("CREATE TABLE itemNotes (\n    itemID INT,\n    sourceItemID INT,\n    note TEXT,    \n    PRIMARY KEY (itemID),\n    FOREIGN KEY (itemID) REFERENCES items(itemID),\n    FOREIGN KEY (sourceItemID) REFERENCES items(itemID)\n);");
+					Zotero.DB.query("INSERT INTO itemNotes SELECT * FROM itemNotesTemp")
+					Zotero.DB.query("DROP TABLE itemNotesTemp");
+				}
 			}
 			
 			_updateSchema('userdata');

chrome/content/zotero/xpcom/translate.js

@@ -1144,6 +1144,8 @@ Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 					newItem.setField(field, data);
 				} else if(field == "seeAlso") {
 					newItem.translateSeeAlso = data;
+				} else if(field == "abstractNote") { // abstractNote is 'abstract' field
+					newItem.setField('abstract', data);
 				} else if(field != "note" && field != "notes" && field != "itemID" &&
 						  field != "attachments" && field != "tags" &&
 						  (fieldID = Zotero.ItemFields.getID(field))) {
@@ -1180,11 +1182,6 @@ Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 			}
 		}
 		
-		// handle abstract
-		if(item.abstractNote) {
-			Zotero.Notes.add(item.abstractNote, myID, true);
-		}
-		
 		// handle attachments
 		if(item.attachments && Zotero.Prefs.get("automaticSnapshots")) {
 			Zotero.debug("HANDLING ATTACHMENTS");
@@ -1812,22 +1809,6 @@ Zotero.Translate.prototype._exportGetItem = function() {
 		} else {
 			var returnItemArray = returnItem.toArray();
 			
-			// handle abstract as abstractNote
-			if(returnItem.isRegularItem()) {
-				var abstractID = returnItem.getAbstract();
-				
-				if(abstractID) {
-					// look for the abstract in the notes array and remove it
-					for(var i in returnItemArray.notes) {
-						if(returnItemArray.notes[i].isAbstract) {
-							returnItemArray.abstractNote = returnItemArray.notes[i].note;
-							returnItemArray.notes.splice(i, 1);
-							break;
-						}
-					}
-				}
-			}
-			
 			// get attachments, although only urls will be passed if exportFileData
 			// is off
 			returnItemArray.attachments = new Array();

chrome/locale/en-US/zotero/zotero.properties

@@ -36,8 +36,6 @@ pane.items.menu.remove			= Remove Selected Item
 pane.items.menu.remove.multiple	= Remove Selected Items
 pane.items.menu.erase			= Delete Selected Item from Library...
 pane.items.menu.erase.multiple	= Delete Selected Items from Library...
-pane.items.menu.abstract.set		= Set Note as Abstract
-pane.items.menu.abstract.unset	= Unset Note as Abstract
 pane.items.menu.export			= Export Selected Item...
 pane.items.menu.export.multiple = Export Selected Items...
 pane.items.menu.createBib		= Create Bibliography from Selected Item...
@@ -200,6 +198,7 @@ itemFields.dictionaryTitle		= Dictionary Title
 itemFields.language				= Language
 itemFields.programmingLanguage	= Language
 itemFields.university			= University
+itemFields.abstract				= Abstract
 
 creatorTypes.author				= Author
 creatorTypes.contributor		= Contributor

chrome/skin/default/zotero/bindings/noteeditor.css

@@ -1,8 +1,3 @@
-noteeditor[abstract="true"] #links
-{
-	display: none;
-}
-
 #citeLabel:hover
 {
 	cursor: pointer !important;

chrome/skin/default/zotero/itemPane.css

@@ -71,8 +71,10 @@
 	margin-left: 0;
 }
 
+#zotero-editpane-dynamic-fields row vbox[fieldname=abstract],
 #zotero-editpane-dynamic-fields row vbox[fieldname=extra]
 {
+	margin-top: 1px;
 	margin-left: 6px;
 }
 

defaults/preferences/zotero.js

@@ -18,6 +18,7 @@ pref("extensions.zotero.automaticTags",true);
 pref("extensions.zotero.fontSize", "1.0");
 
 pref("extensions.zotero.lastCreatorFieldMode",0);
+pref("extensions.zotero.lastAbstractExpand",0);
 pref("extensions.zotero.lastRenameAssociatedFile", false);
 
 // Keyboard shortcuts

system.sql

@@ -1,4 +1,4 @@
--- 11
+-- 12
 
 -- This file creates system tables that can be safely wiped and reinitialized
 -- at any time, as long as existing ids are preserved.
@@ -241,456 +241,491 @@ INSERT INTO fields VALUES (86,'dictionaryTitle',NULL);
 INSERT INTO fields VALUES (87,'language',NULL);
 INSERT INTO fields VALUES (88,'programmingLanguage',NULL);
 INSERT INTO fields VALUES (89,'university',NULL);
+INSERT INTO fields VALUES (90,'abstract',NULL);
 
-INSERT INTO itemTypeFields VALUES (2, 3, NULL, 1);
-INSERT INTO itemTypeFields VALUES (2, 30, NULL, 2);
-INSERT INTO itemTypeFields VALUES (2, 4, NULL, 3);
-INSERT INTO itemTypeFields VALUES (2, 45, NULL, 4);
-INSERT INTO itemTypeFields VALUES (2, 6, NULL, 5);
-INSERT INTO itemTypeFields VALUES (2, 7, NULL, 6);
-INSERT INTO itemTypeFields VALUES (2, 8, NULL, 7);
-INSERT INTO itemTypeFields VALUES (2, 14, NULL, 8);
-INSERT INTO itemTypeFields VALUES (2, 10, NULL, 9);
-INSERT INTO itemTypeFields VALUES (2, 87, NULL, 10);
-INSERT INTO itemTypeFields VALUES (2, 11, NULL, 11);
-INSERT INTO itemTypeFields VALUES (2, 18, NULL, 12);
-INSERT INTO itemTypeFields VALUES (2, 19, NULL, 13);
-INSERT INTO itemTypeFields VALUES (2, 62, NULL, 14);
-INSERT INTO itemTypeFields VALUES (2, 1, NULL, 15);
-INSERT INTO itemTypeFields VALUES (2, 27, NULL, 16);
-INSERT INTO itemTypeFields VALUES (2, 2, NULL, 17);
-INSERT INTO itemTypeFields VALUES (2, 22, NULL, 18);
-INSERT INTO itemTypeFields VALUES (3, 12, NULL, 1);
-INSERT INTO itemTypeFields VALUES (3, 3, NULL, 2);
-INSERT INTO itemTypeFields VALUES (3, 30, NULL, 3);
-INSERT INTO itemTypeFields VALUES (3, 4, NULL, 4);
-INSERT INTO itemTypeFields VALUES (3, 45, NULL, 5);
-INSERT INTO itemTypeFields VALUES (3, 6, NULL, 6);
-INSERT INTO itemTypeFields VALUES (3, 7, NULL, 7);
-INSERT INTO itemTypeFields VALUES (3, 8, NULL, 8);
-INSERT INTO itemTypeFields VALUES (3, 14, NULL, 9);
-INSERT INTO itemTypeFields VALUES (3, 10, NULL, 10);
-INSERT INTO itemTypeFields VALUES (3, 87, NULL, 11);
-INSERT INTO itemTypeFields VALUES (3, 11, NULL, 12);
-INSERT INTO itemTypeFields VALUES (3, 18, NULL, 13);
-INSERT INTO itemTypeFields VALUES (3, 19, NULL, 14);
-INSERT INTO itemTypeFields VALUES (3, 62, NULL, 15);
-INSERT INTO itemTypeFields VALUES (3, 1, NULL, 16);
-INSERT INTO itemTypeFields VALUES (3, 27, NULL, 17);
-INSERT INTO itemTypeFields VALUES (3, 2, NULL, 18);
-INSERT INTO itemTypeFields VALUES (3, 22, NULL, 19);
-INSERT INTO itemTypeFields VALUES (4, 12, NULL, 1);
-INSERT INTO itemTypeFields VALUES (4, 4, NULL, 2);
-INSERT INTO itemTypeFields VALUES (4, 5, NULL, 3);
-INSERT INTO itemTypeFields VALUES (4, 10, NULL, 4);
-INSERT INTO itemTypeFields VALUES (4, 14, NULL, 5);
-INSERT INTO itemTypeFields VALUES (4, 3, NULL, 6);
-INSERT INTO itemTypeFields VALUES (4, 28, NULL, 7);
-INSERT INTO itemTypeFields VALUES (4, 29, NULL, 8);
-INSERT INTO itemTypeFields VALUES (4, 25, NULL, 9);
-INSERT INTO itemTypeFields VALUES (4, 87, NULL, 10);
-INSERT INTO itemTypeFields VALUES (4, 26, NULL, 11);
-INSERT INTO itemTypeFields VALUES (4, 13, NULL, 12);
-INSERT INTO itemTypeFields VALUES (4, 1, NULL, 13);
-INSERT INTO itemTypeFields VALUES (4, 27, NULL, 14);
-INSERT INTO itemTypeFields VALUES (4, 18, NULL, 15);
-INSERT INTO itemTypeFields VALUES (4, 19, NULL, 16);
-INSERT INTO itemTypeFields VALUES (4, 62, NULL, 17);
-INSERT INTO itemTypeFields VALUES (4, 2, NULL, 18);
-INSERT INTO itemTypeFields VALUES (4, 22, NULL, 19);
-INSERT INTO itemTypeFields VALUES (5, 12, NULL, 1);
-INSERT INTO itemTypeFields VALUES (5, 4, NULL, 2);
-INSERT INTO itemTypeFields VALUES (5, 5, NULL, 3);
-INSERT INTO itemTypeFields VALUES (5, 14, NULL, 4);
-INSERT INTO itemTypeFields VALUES (5, 10, NULL, 5);
-INSERT INTO itemTypeFields VALUES (5, 87, NULL, 6);
-INSERT INTO itemTypeFields VALUES (5, 13, NULL, 7);
-INSERT INTO itemTypeFields VALUES (5, 18, NULL, 8);
-INSERT INTO itemTypeFields VALUES (5, 19, NULL, 9);
-INSERT INTO itemTypeFields VALUES (5, 62, NULL, 10);
-INSERT INTO itemTypeFields VALUES (5, 1, NULL, 11);
-INSERT INTO itemTypeFields VALUES (5, 27, NULL, 12);
-INSERT INTO itemTypeFields VALUES (5, 2, NULL, 13);
-INSERT INTO itemTypeFields VALUES (5, 22, NULL, 14);
-INSERT INTO itemTypeFields VALUES (6, 12, NULL, 1);
-INSERT INTO itemTypeFields VALUES (6, 6, NULL, 2);
-INSERT INTO itemTypeFields VALUES (6, 14, NULL, 3);
-INSERT INTO itemTypeFields VALUES (6, 15, NULL, 4);
-INSERT INTO itemTypeFields VALUES (6, 10, NULL, 5);
-INSERT INTO itemTypeFields VALUES (6, 87, NULL, 6);
-INSERT INTO itemTypeFields VALUES (6, 13, NULL, 7);
-INSERT INTO itemTypeFields VALUES (6, 1, NULL, 8);
-INSERT INTO itemTypeFields VALUES (6, 27, NULL, 9);
-INSERT INTO itemTypeFields VALUES (6, 18, NULL, 10);
-INSERT INTO itemTypeFields VALUES (6, 19, NULL, 11);
-INSERT INTO itemTypeFields VALUES (6, 62, NULL, 12);
-INSERT INTO itemTypeFields VALUES (6, 2, NULL, 13);
-INSERT INTO itemTypeFields VALUES (6, 22, NULL, 14);
-INSERT INTO itemTypeFields VALUES (7, 69, NULL, 1);
-INSERT INTO itemTypeFields VALUES (7, 89, NULL, 2);
-INSERT INTO itemTypeFields VALUES (7, 14, NULL, 3);
-INSERT INTO itemTypeFields VALUES (7, 10, NULL, 4);
-INSERT INTO itemTypeFields VALUES (7, 87, NULL, 5);
-INSERT INTO itemTypeFields VALUES (7, 18, NULL, 6);
-INSERT INTO itemTypeFields VALUES (7, 19, NULL, 7);
-INSERT INTO itemTypeFields VALUES (7, 62, NULL, 8);
-INSERT INTO itemTypeFields VALUES (7, 1, NULL, 9);
-INSERT INTO itemTypeFields VALUES (7, 27, NULL, 10);
-INSERT INTO itemTypeFields VALUES (7, 2, NULL, 11);
-INSERT INTO itemTypeFields VALUES (7, 22, NULL, 12);
-INSERT INTO itemTypeFields VALUES (8, 65, NULL, 1);
-INSERT INTO itemTypeFields VALUES (8, 14, NULL, 2);
-INSERT INTO itemTypeFields VALUES (8, 87, NULL, 3);
-INSERT INTO itemTypeFields VALUES (8, 18, NULL, 4);
-INSERT INTO itemTypeFields VALUES (8, 19, NULL, 5);
-INSERT INTO itemTypeFields VALUES (8, 62, NULL, 6);
-INSERT INTO itemTypeFields VALUES (8, 1, NULL, 7);
-INSERT INTO itemTypeFields VALUES (8, 27, NULL, 8);
-INSERT INTO itemTypeFields VALUES (8, 2, NULL, 9);
-INSERT INTO itemTypeFields VALUES (8, 22, NULL, 10);
-INSERT INTO itemTypeFields VALUES (9, 66, NULL, 1);
-INSERT INTO itemTypeFields VALUES (9, 7, NULL, 2);
-INSERT INTO itemTypeFields VALUES (9, 14, NULL, 3);
-INSERT INTO itemTypeFields VALUES (9, 10, NULL, 4);
-INSERT INTO itemTypeFields VALUES (9, 87, NULL, 5);
-INSERT INTO itemTypeFields VALUES (9, 18, NULL, 6);
-INSERT INTO itemTypeFields VALUES (9, 19, NULL, 7);
-INSERT INTO itemTypeFields VALUES (9, 62, NULL, 8);
-INSERT INTO itemTypeFields VALUES (9, 1, NULL, 9);
-INSERT INTO itemTypeFields VALUES (9, 27, NULL, 10);
-INSERT INTO itemTypeFields VALUES (9, 2, NULL, 11);
-INSERT INTO itemTypeFields VALUES (9, 22, NULL, 12);
-INSERT INTO itemTypeFields VALUES (10, 14, NULL, 1);
-INSERT INTO itemTypeFields VALUES (10, 64, NULL, 2);
-INSERT INTO itemTypeFields VALUES (10, 87, NULL, 3);
-INSERT INTO itemTypeFields VALUES (10, 18, NULL, 4);
-INSERT INTO itemTypeFields VALUES (10, 19, NULL, 5);
-INSERT INTO itemTypeFields VALUES (10, 62, NULL, 6);
-INSERT INTO itemTypeFields VALUES (10, 1, NULL, 7);
-INSERT INTO itemTypeFields VALUES (10, 27, NULL, 8);
-INSERT INTO itemTypeFields VALUES (10, 2, NULL, 9);
-INSERT INTO itemTypeFields VALUES (10, 22, NULL, 10);
-INSERT INTO itemTypeFields VALUES (11, 21, NULL, 1);
-INSERT INTO itemTypeFields VALUES (11, 63, NULL, 2);
-INSERT INTO itemTypeFields VALUES (11, 14, NULL, 3);
-INSERT INTO itemTypeFields VALUES (11, 77, NULL, 4);
-INSERT INTO itemTypeFields VALUES (11, 18, NULL, 5);
-INSERT INTO itemTypeFields VALUES (11, 19, NULL, 6);
-INSERT INTO itemTypeFields VALUES (11, 62, NULL, 7);
-INSERT INTO itemTypeFields VALUES (11, 1, NULL, 8);
-INSERT INTO itemTypeFields VALUES (11, 27, NULL, 9);
-INSERT INTO itemTypeFields VALUES (11, 87, NULL, 10);
-INSERT INTO itemTypeFields VALUES (11, 2, NULL, 11);
-INSERT INTO itemTypeFields VALUES (11, 22, NULL, 12);
-INSERT INTO itemTypeFields VALUES (12, 59, NULL, 1);
-INSERT INTO itemTypeFields VALUES (12, 61, NULL, 2);
-INSERT INTO itemTypeFields VALUES (12, 14, NULL, 3);
-INSERT INTO itemTypeFields VALUES (12, 87, NULL, 4);
-INSERT INTO itemTypeFields VALUES (12, 18, NULL, 5);
-INSERT INTO itemTypeFields VALUES (12, 19, NULL, 6);
-INSERT INTO itemTypeFields VALUES (12, 62, NULL, 7);
-INSERT INTO itemTypeFields VALUES (12, 1, NULL, 8);
-INSERT INTO itemTypeFields VALUES (12, 27, NULL, 9);
-INSERT INTO itemTypeFields VALUES (12, 2, NULL, 10);
-INSERT INTO itemTypeFields VALUES (12, 22, NULL, 11);
-INSERT INTO itemTypeFields VALUES (13, 12, NULL, 1);
-INSERT INTO itemTypeFields VALUES (13, 70, NULL, 2);
-INSERT INTO itemTypeFields VALUES (13, 14, NULL, 3);
-INSERT INTO itemTypeFields VALUES (13, 1, NULL, 4);
-INSERT INTO itemTypeFields VALUES (13, 27, NULL, 5);
-INSERT INTO itemTypeFields VALUES (13, 87, NULL, 6);
-INSERT INTO itemTypeFields VALUES (13, 2, NULL, 7);
-INSERT INTO itemTypeFields VALUES (13, 22, NULL, 8);
+INSERT INTO itemTypeFields VALUES (2, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (2, 3, NULL, 2);
+INSERT INTO itemTypeFields VALUES (2, 30, NULL, 3);
+INSERT INTO itemTypeFields VALUES (2, 4, NULL, 4);
+INSERT INTO itemTypeFields VALUES (2, 45, NULL, 5);
+INSERT INTO itemTypeFields VALUES (2, 6, NULL, 6);
+INSERT INTO itemTypeFields VALUES (2, 7, NULL, 7);
+INSERT INTO itemTypeFields VALUES (2, 8, NULL, 8);
+INSERT INTO itemTypeFields VALUES (2, 14, NULL, 9);
+INSERT INTO itemTypeFields VALUES (2, 10, NULL, 10);
+INSERT INTO itemTypeFields VALUES (2, 87, NULL, 11);
+INSERT INTO itemTypeFields VALUES (2, 11, NULL, 12);
+INSERT INTO itemTypeFields VALUES (2, 18, NULL, 13);
+INSERT INTO itemTypeFields VALUES (2, 19, NULL, 14);
+INSERT INTO itemTypeFields VALUES (2, 62, NULL, 15);
+INSERT INTO itemTypeFields VALUES (2, 1, NULL, 16);
+INSERT INTO itemTypeFields VALUES (2, 27, NULL, 17);
+INSERT INTO itemTypeFields VALUES (2, 2, NULL, 18);
+INSERT INTO itemTypeFields VALUES (2, 22, NULL, 19);
+INSERT INTO itemTypeFields VALUES (3, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (3, 12, NULL, 2);
+INSERT INTO itemTypeFields VALUES (3, 3, NULL, 3);
+INSERT INTO itemTypeFields VALUES (3, 30, NULL, 4);
+INSERT INTO itemTypeFields VALUES (3, 4, NULL, 5);
+INSERT INTO itemTypeFields VALUES (3, 45, NULL, 6);
+INSERT INTO itemTypeFields VALUES (3, 6, NULL, 7);
+INSERT INTO itemTypeFields VALUES (3, 7, NULL, 8);
+INSERT INTO itemTypeFields VALUES (3, 8, NULL, 9);
+INSERT INTO itemTypeFields VALUES (3, 14, NULL, 10);
+INSERT INTO itemTypeFields VALUES (3, 10, NULL, 11);
+INSERT INTO itemTypeFields VALUES (3, 87, NULL, 12);
+INSERT INTO itemTypeFields VALUES (3, 11, NULL, 13);
+INSERT INTO itemTypeFields VALUES (3, 18, NULL, 14);
+INSERT INTO itemTypeFields VALUES (3, 19, NULL, 15);
+INSERT INTO itemTypeFields VALUES (3, 62, NULL, 16);
+INSERT INTO itemTypeFields VALUES (3, 1, NULL, 17);
+INSERT INTO itemTypeFields VALUES (3, 27, NULL, 18);
+INSERT INTO itemTypeFields VALUES (3, 2, NULL, 19);
+INSERT INTO itemTypeFields VALUES (3, 22, NULL, 20);
+INSERT INTO itemTypeFields VALUES (4, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (4, 12, NULL, 2);
+INSERT INTO itemTypeFields VALUES (4, 4, NULL, 3);
+INSERT INTO itemTypeFields VALUES (4, 5, NULL, 4);
+INSERT INTO itemTypeFields VALUES (4, 10, NULL, 5);
+INSERT INTO itemTypeFields VALUES (4, 14, NULL, 6);
+INSERT INTO itemTypeFields VALUES (4, 3, NULL, 7);
+INSERT INTO itemTypeFields VALUES (4, 28, NULL, 8);
+INSERT INTO itemTypeFields VALUES (4, 29, NULL, 9);
+INSERT INTO itemTypeFields VALUES (4, 25, NULL, 10);
+INSERT INTO itemTypeFields VALUES (4, 87, NULL, 11);
+INSERT INTO itemTypeFields VALUES (4, 26, NULL, 12);
+INSERT INTO itemTypeFields VALUES (4, 13, NULL, 13);
+INSERT INTO itemTypeFields VALUES (4, 1, NULL, 14);
+INSERT INTO itemTypeFields VALUES (4, 27, NULL, 15);
+INSERT INTO itemTypeFields VALUES (4, 18, NULL, 16);
+INSERT INTO itemTypeFields VALUES (4, 19, NULL, 17);
+INSERT INTO itemTypeFields VALUES (4, 62, NULL, 18);
+INSERT INTO itemTypeFields VALUES (4, 2, NULL, 19);
+INSERT INTO itemTypeFields VALUES (4, 22, NULL, 20);
+INSERT INTO itemTypeFields VALUES (5, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (5, 12, NULL, 2);
+INSERT INTO itemTypeFields VALUES (5, 4, NULL, 3);
+INSERT INTO itemTypeFields VALUES (5, 5, NULL, 4);
+INSERT INTO itemTypeFields VALUES (5, 14, NULL, 5);
+INSERT INTO itemTypeFields VALUES (5, 10, NULL, 6);
+INSERT INTO itemTypeFields VALUES (5, 87, NULL, 7);
+INSERT INTO itemTypeFields VALUES (5, 13, NULL, 8);
+INSERT INTO itemTypeFields VALUES (5, 18, NULL, 9);
+INSERT INTO itemTypeFields VALUES (5, 19, NULL, 10);
+INSERT INTO itemTypeFields VALUES (5, 62, NULL, 11);
+INSERT INTO itemTypeFields VALUES (5, 1, NULL, 12);
+INSERT INTO itemTypeFields VALUES (5, 27, NULL, 13);
+INSERT INTO itemTypeFields VALUES (5, 2, NULL, 14);
+INSERT INTO itemTypeFields VALUES (5, 22, NULL, 15);
+INSERT INTO itemTypeFields VALUES (6, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (6, 12, NULL, 2);
+INSERT INTO itemTypeFields VALUES (6, 6, NULL, 3);
+INSERT INTO itemTypeFields VALUES (6, 14, NULL, 4);
+INSERT INTO itemTypeFields VALUES (6, 15, NULL, 5);
+INSERT INTO itemTypeFields VALUES (6, 10, NULL, 6);
+INSERT INTO itemTypeFields VALUES (6, 87, NULL, 7);
+INSERT INTO itemTypeFields VALUES (6, 13, NULL, 8);
+INSERT INTO itemTypeFields VALUES (6, 1, NULL, 9);
+INSERT INTO itemTypeFields VALUES (6, 27, NULL, 10);
+INSERT INTO itemTypeFields VALUES (6, 18, NULL, 11);
+INSERT INTO itemTypeFields VALUES (6, 19, NULL, 12);
+INSERT INTO itemTypeFields VALUES (6, 62, NULL, 13);
+INSERT INTO itemTypeFields VALUES (6, 2, NULL, 14);
+INSERT INTO itemTypeFields VALUES (6, 22, NULL, 15);
+INSERT INTO itemTypeFields VALUES (7, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (7, 69, NULL, 2);
+INSERT INTO itemTypeFields VALUES (7, 89, NULL, 3);
+INSERT INTO itemTypeFields VALUES (7, 14, NULL, 4);
+INSERT INTO itemTypeFields VALUES (7, 10, NULL, 5);
+INSERT INTO itemTypeFields VALUES (7, 87, NULL, 6);
+INSERT INTO itemTypeFields VALUES (7, 18, NULL, 7);
+INSERT INTO itemTypeFields VALUES (7, 19, NULL, 8);
+INSERT INTO itemTypeFields VALUES (7, 62, NULL, 9);
+INSERT INTO itemTypeFields VALUES (7, 1, NULL, 10);
+INSERT INTO itemTypeFields VALUES (7, 27, NULL, 11);
+INSERT INTO itemTypeFields VALUES (7, 2, NULL, 12);
+INSERT INTO itemTypeFields VALUES (7, 22, NULL, 13);
+INSERT INTO itemTypeFields VALUES (8, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (8, 65, NULL, 2);
+INSERT INTO itemTypeFields VALUES (8, 14, NULL, 3);
+INSERT INTO itemTypeFields VALUES (8, 87, NULL, 4);
+INSERT INTO itemTypeFields VALUES (8, 18, NULL, 5);
+INSERT INTO itemTypeFields VALUES (8, 19, NULL, 6);
+INSERT INTO itemTypeFields VALUES (8, 62, NULL, 7);
+INSERT INTO itemTypeFields VALUES (8, 1, NULL, 8);
+INSERT INTO itemTypeFields VALUES (8, 27, NULL, 9);
+INSERT INTO itemTypeFields VALUES (8, 2, NULL, 10);
+INSERT INTO itemTypeFields VALUES (8, 22, NULL, 11);
+INSERT INTO itemTypeFields VALUES (9, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (9, 66, NULL, 2);
+INSERT INTO itemTypeFields VALUES (9, 7, NULL, 3);
+INSERT INTO itemTypeFields VALUES (9, 14, NULL, 4);
+INSERT INTO itemTypeFields VALUES (9, 10, NULL, 5);
+INSERT INTO itemTypeFields VALUES (9, 87, NULL, 6);
+INSERT INTO itemTypeFields VALUES (9, 18, NULL, 7);
+INSERT INTO itemTypeFields VALUES (9, 19, NULL, 8);
+INSERT INTO itemTypeFields VALUES (9, 62, NULL, 9);
+INSERT INTO itemTypeFields VALUES (9, 1, NULL, 10);
+INSERT INTO itemTypeFields VALUES (9, 27, NULL, 11);
+INSERT INTO itemTypeFields VALUES (9, 2, NULL, 12);
+INSERT INTO itemTypeFields VALUES (9, 22, NULL, 13);
+INSERT INTO itemTypeFields VALUES (10, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (10, 14, NULL, 2);
+INSERT INTO itemTypeFields VALUES (10, 64, NULL, 3);
+INSERT INTO itemTypeFields VALUES (10, 87, NULL, 4);
+INSERT INTO itemTypeFields VALUES (10, 18, NULL, 5);
+INSERT INTO itemTypeFields VALUES (10, 19, NULL, 6);
+INSERT INTO itemTypeFields VALUES (10, 62, NULL, 7);
+INSERT INTO itemTypeFields VALUES (10, 1, NULL, 8);
+INSERT INTO itemTypeFields VALUES (10, 27, NULL, 9);
+INSERT INTO itemTypeFields VALUES (10, 2, NULL, 10);
+INSERT INTO itemTypeFields VALUES (10, 22, NULL, 11);
+INSERT INTO itemTypeFields VALUES (11, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (11, 21, NULL, 2);
+INSERT INTO itemTypeFields VALUES (11, 63, NULL, 3);
+INSERT INTO itemTypeFields VALUES (11, 14, NULL, 4);
+INSERT INTO itemTypeFields VALUES (11, 77, NULL, 5);
+INSERT INTO itemTypeFields VALUES (11, 18, NULL, 6);
+INSERT INTO itemTypeFields VALUES (11, 19, NULL, 7);
+INSERT INTO itemTypeFields VALUES (11, 62, NULL, 8);
+INSERT INTO itemTypeFields VALUES (11, 1, NULL, 9);
+INSERT INTO itemTypeFields VALUES (11, 27, NULL, 10);
+INSERT INTO itemTypeFields VALUES (11, 87, NULL, 11);
+INSERT INTO itemTypeFields VALUES (11, 2, NULL, 12);
+INSERT INTO itemTypeFields VALUES (11, 22, NULL, 13);
+INSERT INTO itemTypeFields VALUES (12, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (12, 59, NULL, 2);
+INSERT INTO itemTypeFields VALUES (12, 61, NULL, 3);
+INSERT INTO itemTypeFields VALUES (12, 14, NULL, 4);
+INSERT INTO itemTypeFields VALUES (12, 87, NULL, 5);
+INSERT INTO itemTypeFields VALUES (12, 18, NULL, 6);
+INSERT INTO itemTypeFields VALUES (12, 19, NULL, 7);
+INSERT INTO itemTypeFields VALUES (12, 62, NULL, 8);
+INSERT INTO itemTypeFields VALUES (12, 1, NULL, 9);
+INSERT INTO itemTypeFields VALUES (12, 27, NULL, 10);
+INSERT INTO itemTypeFields VALUES (12, 2, NULL, 11);
+INSERT INTO itemTypeFields VALUES (12, 22, NULL, 12);
+INSERT INTO itemTypeFields VALUES (13, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (13, 12, NULL, 2);
+INSERT INTO itemTypeFields VALUES (13, 70, NULL, 3);
+INSERT INTO itemTypeFields VALUES (13, 14, NULL, 4);
+INSERT INTO itemTypeFields VALUES (13, 1, NULL, 5);
+INSERT INTO itemTypeFields VALUES (13, 27, NULL, 6);
+INSERT INTO itemTypeFields VALUES (13, 87, NULL, 7);
+INSERT INTO itemTypeFields VALUES (13, 2, NULL, 8);
+INSERT INTO itemTypeFields VALUES (13, 22, NULL, 9);
 INSERT INTO itemTypeFields VALUES (14, 27, NULL, 1);
 INSERT INTO itemTypeFields VALUES (14, 1, NULL, 2);
-INSERT INTO itemTypeFields VALUES (15, 60, NULL, 1);
-INSERT INTO itemTypeFields VALUES (15, 32, NULL, 2);
-INSERT INTO itemTypeFields VALUES (15, 28, NULL, 3);
-INSERT INTO itemTypeFields VALUES (15, 7, NULL, 4);
-INSERT INTO itemTypeFields VALUES (15, 31, NULL, 5);
-INSERT INTO itemTypeFields VALUES (15, 14, NULL, 6);
-INSERT INTO itemTypeFields VALUES (15, 10, NULL, 7);
-INSERT INTO itemTypeFields VALUES (15, 87, NULL, 8);
-INSERT INTO itemTypeFields VALUES (15, 1, NULL, 9);
-INSERT INTO itemTypeFields VALUES (15, 27, NULL, 10);
-INSERT INTO itemTypeFields VALUES (15, 18, NULL, 11);
-INSERT INTO itemTypeFields VALUES (15, 19, NULL, 12);
-INSERT INTO itemTypeFields VALUES (15, 62, NULL, 13);
-INSERT INTO itemTypeFields VALUES (15, 2, NULL, 14);
-INSERT INTO itemTypeFields VALUES (15, 22, NULL, 15);
-INSERT INTO itemTypeFields VALUES (16, 60, NULL, 1);
-INSERT INTO itemTypeFields VALUES (16, 36, NULL, 2);
-INSERT INTO itemTypeFields VALUES (16, 4, NULL, 3);
-INSERT INTO itemTypeFields VALUES (16, 15, NULL, 4);
-INSERT INTO itemTypeFields VALUES (16, 10, NULL, 5);
-INSERT INTO itemTypeFields VALUES (16, 41, NULL, 6);
-INSERT INTO itemTypeFields VALUES (16, 40, NULL, 7);
-INSERT INTO itemTypeFields VALUES (16, 42, NULL, 8);
-INSERT INTO itemTypeFields VALUES (16, 14, NULL, 9);
-INSERT INTO itemTypeFields VALUES (16, 87, NULL, 10);
-INSERT INTO itemTypeFields VALUES (16, 1, NULL, 11);
-INSERT INTO itemTypeFields VALUES (16, 27, NULL, 12);
-INSERT INTO itemTypeFields VALUES (16, 2, NULL, 13);
-INSERT INTO itemTypeFields VALUES (16, 22, NULL, 14);
-INSERT INTO itemTypeFields VALUES (17, 43, NULL, 1);
-INSERT INTO itemTypeFields VALUES (17, 4, NULL, 2);
-INSERT INTO itemTypeFields VALUES (17, 44, NULL, 3);
-INSERT INTO itemTypeFields VALUES (17, 10, NULL, 4);
-INSERT INTO itemTypeFields VALUES (17, 42, NULL, 5);
-INSERT INTO itemTypeFields VALUES (17, 14, NULL, 6);
-INSERT INTO itemTypeFields VALUES (17, 87, NULL, 7);
-INSERT INTO itemTypeFields VALUES (17, 1, NULL, 8);
-INSERT INTO itemTypeFields VALUES (17, 27, NULL, 9);
-INSERT INTO itemTypeFields VALUES (17, 2, NULL, 10);
-INSERT INTO itemTypeFields VALUES (17, 22, NULL, 11);
-INSERT INTO itemTypeFields VALUES (18, 46, NULL, 1);
-INSERT INTO itemTypeFields VALUES (18, 7, NULL, 2);
-INSERT INTO itemTypeFields VALUES (18, 8, NULL, 3);
-INSERT INTO itemTypeFields VALUES (18, 45, NULL, 4);
-INSERT INTO itemTypeFields VALUES (18, 60, NULL, 5);
-INSERT INTO itemTypeFields VALUES (18, 10, NULL, 6);
-INSERT INTO itemTypeFields VALUES (18, 41, NULL, 7);
-INSERT INTO itemTypeFields VALUES (18, 40, NULL, 8);
-INSERT INTO itemTypeFields VALUES (18, 42, NULL, 9);
-INSERT INTO itemTypeFields VALUES (18, 14, NULL, 10);
-INSERT INTO itemTypeFields VALUES (18, 1, NULL, 11);
-INSERT INTO itemTypeFields VALUES (18, 27, NULL, 12);
-INSERT INTO itemTypeFields VALUES (18, 87, NULL, 13);
-INSERT INTO itemTypeFields VALUES (18, 2, NULL, 14);
-INSERT INTO itemTypeFields VALUES (18, 22, NULL, 15);
-INSERT INTO itemTypeFields VALUES (19, 7, NULL, 1);
-INSERT INTO itemTypeFields VALUES (19, 48, NULL, 2);
-INSERT INTO itemTypeFields VALUES (19, 60, NULL, 3);
-INSERT INTO itemTypeFields VALUES (19, 14, NULL, 4);
-INSERT INTO itemTypeFields VALUES (19, 10, NULL, 5);
-INSERT INTO itemTypeFields VALUES (19, 50, NULL, 6);
-INSERT INTO itemTypeFields VALUES (19, 51, NULL, 7);
-INSERT INTO itemTypeFields VALUES (19, 52, NULL, 8);
-INSERT INTO itemTypeFields VALUES (19, 53, NULL, 9);
-INSERT INTO itemTypeFields VALUES (19, 54, NULL, 10);
-INSERT INTO itemTypeFields VALUES (19, 87, NULL, 11);
-INSERT INTO itemTypeFields VALUES (19, 1, NULL, 12);
-INSERT INTO itemTypeFields VALUES (19, 27, NULL, 13);
-INSERT INTO itemTypeFields VALUES (19, 2, NULL, 14);
-INSERT INTO itemTypeFields VALUES (19, 22, NULL, 15);
-INSERT INTO itemTypeFields VALUES (20, 36, NULL, 1);
-INSERT INTO itemTypeFields VALUES (20, 55, NULL, 2);
-INSERT INTO itemTypeFields VALUES (20, 60, NULL, 3);
-INSERT INTO itemTypeFields VALUES (20, 14, NULL, 4);
-INSERT INTO itemTypeFields VALUES (20, 10, NULL, 5);
-INSERT INTO itemTypeFields VALUES (20, 15, NULL, 6);
-INSERT INTO itemTypeFields VALUES (20, 40, NULL, 7);
-INSERT INTO itemTypeFields VALUES (20, 42, NULL, 8);
-INSERT INTO itemTypeFields VALUES (20, 87, NULL, 9);
-INSERT INTO itemTypeFields VALUES (20, 1, NULL, 10);
-INSERT INTO itemTypeFields VALUES (20, 27, NULL, 11);
-INSERT INTO itemTypeFields VALUES (20, 2, NULL, 12);
-INSERT INTO itemTypeFields VALUES (20, 22, NULL, 13);
-INSERT INTO itemTypeFields VALUES (21, 14, NULL, 1);
-INSERT INTO itemTypeFields VALUES (21, 1, NULL, 2);
-INSERT INTO itemTypeFields VALUES (21, 27, NULL, 3);
-INSERT INTO itemTypeFields VALUES (21, 87, NULL, 4);
-INSERT INTO itemTypeFields VALUES (21, 2, NULL, 5);
-INSERT INTO itemTypeFields VALUES (21, 22, NULL, 6);
-INSERT INTO itemTypeFields VALUES (22, 67, NULL, 1);
-INSERT INTO itemTypeFields VALUES (22, 68, NULL, 2);
-INSERT INTO itemTypeFields VALUES (22, 28, NULL, 3);
-INSERT INTO itemTypeFields VALUES (22, 6, NULL, 4);
-INSERT INTO itemTypeFields VALUES (22, 7, NULL, 5);
-INSERT INTO itemTypeFields VALUES (22, 8, NULL, 6);
-INSERT INTO itemTypeFields VALUES (22, 14, NULL, 7);
-INSERT INTO itemTypeFields VALUES (22, 87, NULL, 8);
-INSERT INTO itemTypeFields VALUES (22, 11, NULL, 9);
-INSERT INTO itemTypeFields VALUES (22, 18, NULL, 10);
-INSERT INTO itemTypeFields VALUES (22, 19, NULL, 11);
-INSERT INTO itemTypeFields VALUES (22, 62, NULL, 12);
-INSERT INTO itemTypeFields VALUES (22, 1, NULL, 13);
-INSERT INTO itemTypeFields VALUES (22, 27, NULL, 14);
-INSERT INTO itemTypeFields VALUES (22, 2, NULL, 15);
-INSERT INTO itemTypeFields VALUES (22, 22, NULL, 16);
-INSERT INTO itemTypeFields VALUES (23, 12, NULL, 1);
-INSERT INTO itemTypeFields VALUES (23, 70, NULL, 2);
-INSERT INTO itemTypeFields VALUES (23, 14, NULL, 3);
-INSERT INTO itemTypeFields VALUES (23, 1, NULL, 4);
-INSERT INTO itemTypeFields VALUES (23, 27, NULL, 5);
-INSERT INTO itemTypeFields VALUES (23, 87, NULL, 6);
-INSERT INTO itemTypeFields VALUES (23, 2, NULL, 7);
-INSERT INTO itemTypeFields VALUES (23, 22, NULL, 8);
-INSERT INTO itemTypeFields VALUES (24, 14, NULL, 1);
-INSERT INTO itemTypeFields VALUES (24, 1, NULL, 2);
-INSERT INTO itemTypeFields VALUES (24, 27, NULL, 3);
-INSERT INTO itemTypeFields VALUES (24, 87, NULL, 4);
-INSERT INTO itemTypeFields VALUES (24, 2, NULL, 5);
-INSERT INTO itemTypeFields VALUES (24, 22, NULL, 6);
-INSERT INTO itemTypeFields VALUES (25, 12, NULL, 1);
-INSERT INTO itemTypeFields VALUES (25, 79, NULL, 2);
-INSERT INTO itemTypeFields VALUES (25, 14, NULL, 3);
-INSERT INTO itemTypeFields VALUES (25, 1, NULL, 4);
-INSERT INTO itemTypeFields VALUES (25, 27, NULL, 5);
-INSERT INTO itemTypeFields VALUES (25, 87, NULL, 6);
-INSERT INTO itemTypeFields VALUES (25, 2, NULL, 7);
-INSERT INTO itemTypeFields VALUES (25, 22, NULL, 8);
-INSERT INTO itemTypeFields VALUES (26, 71, NULL, 1);
-INSERT INTO itemTypeFields VALUES (26, 28, NULL, 2);
-INSERT INTO itemTypeFields VALUES (26, 4, NULL, 3);
-INSERT INTO itemTypeFields VALUES (26, 45, NULL, 4);
-INSERT INTO itemTypeFields VALUES (26, 7, NULL, 5);
-INSERT INTO itemTypeFields VALUES (26, 72, NULL, 6);
-INSERT INTO itemTypeFields VALUES (26, 14, NULL, 7);
-INSERT INTO itemTypeFields VALUES (26, 77, NULL, 8);
-INSERT INTO itemTypeFields VALUES (26, 87, NULL, 9);
-INSERT INTO itemTypeFields VALUES (26, 11, NULL, 10);
-INSERT INTO itemTypeFields VALUES (26, 18, NULL, 11);
-INSERT INTO itemTypeFields VALUES (26, 19, NULL, 12);
-INSERT INTO itemTypeFields VALUES (26, 62, NULL, 13);
-INSERT INTO itemTypeFields VALUES (26, 1, NULL, 14);
-INSERT INTO itemTypeFields VALUES (26, 27, NULL, 15);
-INSERT INTO itemTypeFields VALUES (26, 2, NULL, 16);
-INSERT INTO itemTypeFields VALUES (26, 22, NULL, 17);
-INSERT INTO itemTypeFields VALUES (27, 74, NULL, 1);
-INSERT INTO itemTypeFields VALUES (27, 14, NULL, 2);
-INSERT INTO itemTypeFields VALUES (27, 7, NULL, 3);
-INSERT INTO itemTypeFields VALUES (27, 75, NULL, 4);
-INSERT INTO itemTypeFields VALUES (27, 1, NULL, 5);
-INSERT INTO itemTypeFields VALUES (27, 27, NULL, 6);
-INSERT INTO itemTypeFields VALUES (27, 87, NULL, 7);
-INSERT INTO itemTypeFields VALUES (27, 2, NULL, 8);
-INSERT INTO itemTypeFields VALUES (27, 22, NULL, 9);
-INSERT INTO itemTypeFields VALUES (28, 63, NULL, 1);
-INSERT INTO itemTypeFields VALUES (28, 28, NULL, 2);
-INSERT INTO itemTypeFields VALUES (28, 4, NULL, 3);
-INSERT INTO itemTypeFields VALUES (28, 45, NULL, 4);
-INSERT INTO itemTypeFields VALUES (28, 7, NULL, 5);
-INSERT INTO itemTypeFields VALUES (28, 76, NULL, 6);
-INSERT INTO itemTypeFields VALUES (28, 14, NULL, 7);
-INSERT INTO itemTypeFields VALUES (28, 77, NULL, 8);
-INSERT INTO itemTypeFields VALUES (28, 87, NULL, 9);
-INSERT INTO itemTypeFields VALUES (28, 11, NULL, 10);
-INSERT INTO itemTypeFields VALUES (28, 18, NULL, 11);
-INSERT INTO itemTypeFields VALUES (28, 19, NULL, 12);
-INSERT INTO itemTypeFields VALUES (28, 62, NULL, 13);
-INSERT INTO itemTypeFields VALUES (28, 2, NULL, 14);
-INSERT INTO itemTypeFields VALUES (28, 1, NULL, 15);
-INSERT INTO itemTypeFields VALUES (28, 27, NULL, 16);
-INSERT INTO itemTypeFields VALUES (28, 22, NULL, 17);
-INSERT INTO itemTypeFields VALUES (29, 28, NULL, 1);
-INSERT INTO itemTypeFields VALUES (29, 60, NULL, 2);
-INSERT INTO itemTypeFields VALUES (29, 63, NULL, 3);
-INSERT INTO itemTypeFields VALUES (29, 7, NULL, 4);
-INSERT INTO itemTypeFields VALUES (29, 78, NULL, 5);
-INSERT INTO itemTypeFields VALUES (29, 14, NULL, 6);
-INSERT INTO itemTypeFields VALUES (29, 77, NULL, 7);
-INSERT INTO itemTypeFields VALUES (29, 87, NULL, 8);
-INSERT INTO itemTypeFields VALUES (29, 18, NULL, 9);
-INSERT INTO itemTypeFields VALUES (29, 19, NULL, 10);
-INSERT INTO itemTypeFields VALUES (29, 62, NULL, 11);
-INSERT INTO itemTypeFields VALUES (29, 1, NULL, 12);
-INSERT INTO itemTypeFields VALUES (29, 27, NULL, 13);
-INSERT INTO itemTypeFields VALUES (29, 2, NULL, 14);
-INSERT INTO itemTypeFields VALUES (29, 22, NULL, 15);
-INSERT INTO itemTypeFields VALUES (30, 28, NULL, 1);
-INSERT INTO itemTypeFields VALUES (30, 60, NULL, 2);
-INSERT INTO itemTypeFields VALUES (30, 71, NULL, 3);
-INSERT INTO itemTypeFields VALUES (30, 7, NULL, 4);
-INSERT INTO itemTypeFields VALUES (30, 78, NULL, 5);
-INSERT INTO itemTypeFields VALUES (30, 14, NULL, 6);
-INSERT INTO itemTypeFields VALUES (30, 77, NULL, 7);
-INSERT INTO itemTypeFields VALUES (30, 87, NULL, 8);
-INSERT INTO itemTypeFields VALUES (30, 18, NULL, 9);
-INSERT INTO itemTypeFields VALUES (30, 19, NULL, 10);
-INSERT INTO itemTypeFields VALUES (30, 62, NULL, 11);
-INSERT INTO itemTypeFields VALUES (30, 2, NULL, 12);
-INSERT INTO itemTypeFields VALUES (30, 1, NULL, 13);
-INSERT INTO itemTypeFields VALUES (30, 27, NULL, 14);
-INSERT INTO itemTypeFields VALUES (30, 22, NULL, 15);
-INSERT INTO itemTypeFields VALUES (31, 28, NULL, 1);
-INSERT INTO itemTypeFields VALUES (31, 60, NULL, 2);
-INSERT INTO itemTypeFields VALUES (31, 80, NULL, 3);
-INSERT INTO itemTypeFields VALUES (31, 77, NULL, 4);
-INSERT INTO itemTypeFields VALUES (31, 1, NULL, 5);
-INSERT INTO itemTypeFields VALUES (31, 27, NULL, 6);
-INSERT INTO itemTypeFields VALUES (31, 87, NULL, 7);
-INSERT INTO itemTypeFields VALUES (31, 2, NULL, 8);
-INSERT INTO itemTypeFields VALUES (31, 22, NULL, 9);
-INSERT INTO itemTypeFields VALUES (32, 28, NULL, 1);
-INSERT INTO itemTypeFields VALUES (32, 81, NULL, 2);
-INSERT INTO itemTypeFields VALUES (32, 82, NULL, 3);
-INSERT INTO itemTypeFields VALUES (32, 7, NULL, 4);
-INSERT INTO itemTypeFields VALUES (32, 83, NULL, 5);
-INSERT INTO itemTypeFields VALUES (32, 88, NULL, 6);
-INSERT INTO itemTypeFields VALUES (32, 11, NULL, 7);
-INSERT INTO itemTypeFields VALUES (32, 18, NULL, 8);
-INSERT INTO itemTypeFields VALUES (32, 19, NULL, 9);
-INSERT INTO itemTypeFields VALUES (32, 62, NULL, 10);
-INSERT INTO itemTypeFields VALUES (32, 1, NULL, 11);
-INSERT INTO itemTypeFields VALUES (32, 27, NULL, 12);
-INSERT INTO itemTypeFields VALUES (32, 2, NULL, 13);
-INSERT INTO itemTypeFields VALUES (32, 22, NULL, 14);
-INSERT INTO itemTypeFields VALUES (33, 14, NULL, 1);
-INSERT INTO itemTypeFields VALUES (33, 84, NULL, 2);
-INSERT INTO itemTypeFields VALUES (33, 7, NULL, 3);
-INSERT INTO itemTypeFields VALUES (33, 8, NULL, 4);
-INSERT INTO itemTypeFields VALUES (33, 4, NULL, 5);
-INSERT INTO itemTypeFields VALUES (33, 10, NULL, 6);
-INSERT INTO itemTypeFields VALUES (33, 3, NULL, 7);
-INSERT INTO itemTypeFields VALUES (33, 87, NULL, 8);
-INSERT INTO itemTypeFields VALUES (33, 26, NULL, 9);
-INSERT INTO itemTypeFields VALUES (33, 11, NULL, 10);
-INSERT INTO itemTypeFields VALUES (33, 18, NULL, 11);
-INSERT INTO itemTypeFields VALUES (33, 19, NULL, 12);
-INSERT INTO itemTypeFields VALUES (33, 62, NULL, 13);
-INSERT INTO itemTypeFields VALUES (33, 1, NULL, 14);
-INSERT INTO itemTypeFields VALUES (33, 27, NULL, 15);
-INSERT INTO itemTypeFields VALUES (33, 2, NULL, 16);
-INSERT INTO itemTypeFields VALUES (33, 22, NULL, 17);
-INSERT INTO itemTypeFields VALUES (34, 8, NULL, 1);
-INSERT INTO itemTypeFields VALUES (34, 14, NULL, 2);
-INSERT INTO itemTypeFields VALUES (34, 1, NULL, 3);
-INSERT INTO itemTypeFields VALUES (34, 27, NULL, 4);
-INSERT INTO itemTypeFields VALUES (34, 87, NULL, 5);
-INSERT INTO itemTypeFields VALUES (34, 18, NULL, 6);
-INSERT INTO itemTypeFields VALUES (34, 19, NULL, 7);
-INSERT INTO itemTypeFields VALUES (34, 62, NULL, 8);
-INSERT INTO itemTypeFields VALUES (34, 2, NULL, 9);
-INSERT INTO itemTypeFields VALUES (34, 22, NULL, 10);
-INSERT INTO itemTypeFields VALUES (35, 85, NULL, 1);
-INSERT INTO itemTypeFields VALUES (35, 3, NULL, 2);
-INSERT INTO itemTypeFields VALUES (35, 30, NULL, 3);
-INSERT INTO itemTypeFields VALUES (35, 4, NULL, 4);
-INSERT INTO itemTypeFields VALUES (35, 45, NULL, 5);
-INSERT INTO itemTypeFields VALUES (35, 6, NULL, 6);
-INSERT INTO itemTypeFields VALUES (35, 7, NULL, 7);
-INSERT INTO itemTypeFields VALUES (35, 8, NULL, 8);
-INSERT INTO itemTypeFields VALUES (35, 14, NULL, 9);
-INSERT INTO itemTypeFields VALUES (35, 10, NULL, 10);
-INSERT INTO itemTypeFields VALUES (35, 11, NULL, 11);
-INSERT INTO itemTypeFields VALUES (35, 1, NULL, 12);
-INSERT INTO itemTypeFields VALUES (35, 27, NULL, 13);
-INSERT INTO itemTypeFields VALUES (35, 87, NULL, 14);
-INSERT INTO itemTypeFields VALUES (35, 18, NULL, 15);
-INSERT INTO itemTypeFields VALUES (35, 19, NULL, 16);
-INSERT INTO itemTypeFields VALUES (35, 62, NULL, 17);
-INSERT INTO itemTypeFields VALUES (35, 2, NULL, 18);
-INSERT INTO itemTypeFields VALUES (35, 22, NULL, 19);
-INSERT INTO itemTypeFields VALUES (36, 86, NULL, 1);
-INSERT INTO itemTypeFields VALUES (36, 3, NULL, 2);
-INSERT INTO itemTypeFields VALUES (36, 30, NULL, 3);
-INSERT INTO itemTypeFields VALUES (36, 4, NULL, 4);
-INSERT INTO itemTypeFields VALUES (36, 45, NULL, 5);
-INSERT INTO itemTypeFields VALUES (36, 6, NULL, 6);
-INSERT INTO itemTypeFields VALUES (36, 7, NULL, 7);
-INSERT INTO itemTypeFields VALUES (36, 8, NULL, 8);
-INSERT INTO itemTypeFields VALUES (36, 14, NULL, 9);
-INSERT INTO itemTypeFields VALUES (36, 10, NULL, 10);
-INSERT INTO itemTypeFields VALUES (36, 87, NULL, 11);
-INSERT INTO itemTypeFields VALUES (36, 11, NULL, 12);
-INSERT INTO itemTypeFields VALUES (36, 18, NULL, 13);
-INSERT INTO itemTypeFields VALUES (36, 19, NULL, 14);
-INSERT INTO itemTypeFields VALUES (36, 62, NULL, 15);
-INSERT INTO itemTypeFields VALUES (36, 1, NULL, 16);
-INSERT INTO itemTypeFields VALUES (36, 27, NULL, 17);
-INSERT INTO itemTypeFields VALUES (36, 2, NULL, 18);
-INSERT INTO itemTypeFields VALUES (36, 22, NULL, 19);
+INSERT INTO itemTypeFields VALUES (15, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (15, 60, NULL, 2);
+INSERT INTO itemTypeFields VALUES (15, 32, NULL, 3);
+INSERT INTO itemTypeFields VALUES (15, 28, NULL, 4);
+INSERT INTO itemTypeFields VALUES (15, 7, NULL, 5);
+INSERT INTO itemTypeFields VALUES (15, 31, NULL, 6);
+INSERT INTO itemTypeFields VALUES (15, 14, NULL, 7);
+INSERT INTO itemTypeFields VALUES (15, 10, NULL, 8);
+INSERT INTO itemTypeFields VALUES (15, 87, NULL, 9);
+INSERT INTO itemTypeFields VALUES (15, 1, NULL, 10);
+INSERT INTO itemTypeFields VALUES (15, 27, NULL, 11);
+INSERT INTO itemTypeFields VALUES (15, 18, NULL, 12);
+INSERT INTO itemTypeFields VALUES (15, 19, NULL, 13);
+INSERT INTO itemTypeFields VALUES (15, 62, NULL, 14);
+INSERT INTO itemTypeFields VALUES (15, 2, NULL, 15);
+INSERT INTO itemTypeFields VALUES (15, 22, NULL, 16);
+INSERT INTO itemTypeFields VALUES (16, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (16, 60, NULL, 2);
+INSERT INTO itemTypeFields VALUES (16, 36, NULL, 3);
+INSERT INTO itemTypeFields VALUES (16, 4, NULL, 4);
+INSERT INTO itemTypeFields VALUES (16, 15, NULL, 5);
+INSERT INTO itemTypeFields VALUES (16, 10, NULL, 6);
+INSERT INTO itemTypeFields VALUES (16, 41, NULL, 7);
+INSERT INTO itemTypeFields VALUES (16, 40, NULL, 8);
+INSERT INTO itemTypeFields VALUES (16, 42, NULL, 9);
+INSERT INTO itemTypeFields VALUES (16, 14, NULL, 10);
+INSERT INTO itemTypeFields VALUES (16, 87, NULL, 11);
+INSERT INTO itemTypeFields VALUES (16, 1, NULL, 12);
+INSERT INTO itemTypeFields VALUES (16, 27, NULL, 13);
+INSERT INTO itemTypeFields VALUES (16, 2, NULL, 14);
+INSERT INTO itemTypeFields VALUES (16, 22, NULL, 15);
+INSERT INTO itemTypeFields VALUES (17, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (17, 43, NULL, 2);
+INSERT INTO itemTypeFields VALUES (17, 4, NULL, 3);
+INSERT INTO itemTypeFields VALUES (17, 44, NULL, 4);
+INSERT INTO itemTypeFields VALUES (17, 10, NULL, 5);
+INSERT INTO itemTypeFields VALUES (17, 42, NULL, 6);
+INSERT INTO itemTypeFields VALUES (17, 14, NULL, 7);
+INSERT INTO itemTypeFields VALUES (17, 87, NULL, 8);
+INSERT INTO itemTypeFields VALUES (17, 1, NULL, 9);
+INSERT INTO itemTypeFields VALUES (17, 27, NULL, 10);
+INSERT INTO itemTypeFields VALUES (17, 2, NULL, 11);
+INSERT INTO itemTypeFields VALUES (17, 22, NULL, 12);
+INSERT INTO itemTypeFields VALUES (18, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (18, 46, NULL, 2);
+INSERT INTO itemTypeFields VALUES (18, 7, NULL, 3);
+INSERT INTO itemTypeFields VALUES (18, 8, NULL, 4);
+INSERT INTO itemTypeFields VALUES (18, 45, NULL, 5);
+INSERT INTO itemTypeFields VALUES (18, 60, NULL, 6);
+INSERT INTO itemTypeFields VALUES (18, 10, NULL, 7);
+INSERT INTO itemTypeFields VALUES (18, 41, NULL, 8);
+INSERT INTO itemTypeFields VALUES (18, 40, NULL, 9);
+INSERT INTO itemTypeFields VALUES (18, 42, NULL, 10);
+INSERT INTO itemTypeFields VALUES (18, 14, NULL, 11);
+INSERT INTO itemTypeFields VALUES (18, 1, NULL, 12);
+INSERT INTO itemTypeFields VALUES (18, 27, NULL, 13);
+INSERT INTO itemTypeFields VALUES (18, 87, NULL, 14);
+INSERT INTO itemTypeFields VALUES (18, 2, NULL, 15);
+INSERT INTO itemTypeFields VALUES (18, 22, NULL, 16);
+INSERT INTO itemTypeFields VALUES (19, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (19, 7, NULL, 2);
+INSERT INTO itemTypeFields VALUES (19, 48, NULL, 3);
+INSERT INTO itemTypeFields VALUES (19, 60, NULL, 4);
+INSERT INTO itemTypeFields VALUES (19, 14, NULL, 5);
+INSERT INTO itemTypeFields VALUES (19, 10, NULL, 6);
+INSERT INTO itemTypeFields VALUES (19, 50, NULL, 7);
+INSERT INTO itemTypeFields VALUES (19, 51, NULL, 8);
+INSERT INTO itemTypeFields VALUES (19, 52, NULL, 9);
+INSERT INTO itemTypeFields VALUES (19, 53, NULL, 10);
+INSERT INTO itemTypeFields VALUES (19, 54, NULL, 11);
+INSERT INTO itemTypeFields VALUES (19, 87, NULL, 12);
+INSERT INTO itemTypeFields VALUES (19, 1, NULL, 13);
+INSERT INTO itemTypeFields VALUES (19, 27, NULL, 14);
+INSERT INTO itemTypeFields VALUES (19, 2, NULL, 15);
+INSERT INTO itemTypeFields VALUES (19, 22, NULL, 16);
+INSERT INTO itemTypeFields VALUES (20, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (20, 36, NULL, 2);
+INSERT INTO itemTypeFields VALUES (20, 55, NULL, 3);
+INSERT INTO itemTypeFields VALUES (20, 60, NULL, 4);
+INSERT INTO itemTypeFields VALUES (20, 14, NULL, 5);
+INSERT INTO itemTypeFields VALUES (20, 10, NULL, 6);
+INSERT INTO itemTypeFields VALUES (20, 15, NULL, 7);
+INSERT INTO itemTypeFields VALUES (20, 40, NULL, 8);
+INSERT INTO itemTypeFields VALUES (20, 42, NULL, 9);
+INSERT INTO itemTypeFields VALUES (20, 87, NULL, 10);
+INSERT INTO itemTypeFields VALUES (20, 1, NULL, 11);
+INSERT INTO itemTypeFields VALUES (20, 27, NULL, 12);
+INSERT INTO itemTypeFields VALUES (20, 2, NULL, 13);
+INSERT INTO itemTypeFields VALUES (20, 22, NULL, 14);
+INSERT INTO itemTypeFields VALUES (21, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (21, 14, NULL, 2);
+INSERT INTO itemTypeFields VALUES (21, 1, NULL, 3);
+INSERT INTO itemTypeFields VALUES (21, 27, NULL, 4);
+INSERT INTO itemTypeFields VALUES (21, 87, NULL, 5);
+INSERT INTO itemTypeFields VALUES (21, 2, NULL, 6);
+INSERT INTO itemTypeFields VALUES (21, 22, NULL, 7);
+INSERT INTO itemTypeFields VALUES (22, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (22, 67, NULL, 2);
+INSERT INTO itemTypeFields VALUES (22, 68, NULL, 3);
+INSERT INTO itemTypeFields VALUES (22, 28, NULL, 4);
+INSERT INTO itemTypeFields VALUES (22, 6, NULL, 5);
+INSERT INTO itemTypeFields VALUES (22, 7, NULL, 6);
+INSERT INTO itemTypeFields VALUES (22, 8, NULL, 7);
+INSERT INTO itemTypeFields VALUES (22, 14, NULL, 8);
+INSERT INTO itemTypeFields VALUES (22, 87, NULL, 9);
+INSERT INTO itemTypeFields VALUES (22, 11, NULL, 10);
+INSERT INTO itemTypeFields VALUES (22, 18, NULL, 11);
+INSERT INTO itemTypeFields VALUES (22, 19, NULL, 12);
+INSERT INTO itemTypeFields VALUES (22, 62, NULL, 13);
+INSERT INTO itemTypeFields VALUES (22, 1, NULL, 14);
+INSERT INTO itemTypeFields VALUES (22, 27, NULL, 15);
+INSERT INTO itemTypeFields VALUES (22, 2, NULL, 16);
+INSERT INTO itemTypeFields VALUES (22, 22, NULL, 17);
+INSERT INTO itemTypeFields VALUES (23, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (23, 12, NULL, 2);
+INSERT INTO itemTypeFields VALUES (23, 70, NULL, 3);
+INSERT INTO itemTypeFields VALUES (23, 14, NULL, 4);
+INSERT INTO itemTypeFields VALUES (23, 1, NULL, 5);
+INSERT INTO itemTypeFields VALUES (23, 27, NULL, 6);
+INSERT INTO itemTypeFields VALUES (23, 87, NULL, 7);
+INSERT INTO itemTypeFields VALUES (23, 2, NULL, 8);
+INSERT INTO itemTypeFields VALUES (23, 22, NULL, 9);
+INSERT INTO itemTypeFields VALUES (24, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (24, 14, NULL, 2);
+INSERT INTO itemTypeFields VALUES (24, 1, NULL, 3);
+INSERT INTO itemTypeFields VALUES (24, 27, NULL, 4);
+INSERT INTO itemTypeFields VALUES (24, 87, NULL, 5);
+INSERT INTO itemTypeFields VALUES (24, 2, NULL, 6);
+INSERT INTO itemTypeFields VALUES (24, 22, NULL, 7);
+INSERT INTO itemTypeFields VALUES (25, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (25, 12, NULL, 2);
+INSERT INTO itemTypeFields VALUES (25, 79, NULL, 3);
+INSERT INTO itemTypeFields VALUES (25, 14, NULL, 4);
+INSERT INTO itemTypeFields VALUES (25, 1, NULL, 5);
+INSERT INTO itemTypeFields VALUES (25, 27, NULL, 6);
+INSERT INTO itemTypeFields VALUES (25, 87, NULL, 7);
+INSERT INTO itemTypeFields VALUES (25, 2, NULL, 8);
+INSERT INTO itemTypeFields VALUES (25, 22, NULL, 9);
+INSERT INTO itemTypeFields VALUES (26, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (26, 71, NULL, 2);
+INSERT INTO itemTypeFields VALUES (26, 28, NULL, 3);
+INSERT INTO itemTypeFields VALUES (26, 4, NULL, 4);
+INSERT INTO itemTypeFields VALUES (26, 45, NULL, 5);
+INSERT INTO itemTypeFields VALUES (26, 7, NULL, 6);
+INSERT INTO itemTypeFields VALUES (26, 72, NULL, 7);
+INSERT INTO itemTypeFields VALUES (26, 14, NULL, 8);
+INSERT INTO itemTypeFields VALUES (26, 77, NULL, 9);
+INSERT INTO itemTypeFields VALUES (26, 87, NULL, 10);
+INSERT INTO itemTypeFields VALUES (26, 11, NULL, 11);
+INSERT INTO itemTypeFields VALUES (26, 18, NULL, 12);
+INSERT INTO itemTypeFields VALUES (26, 19, NULL, 13);
+INSERT INTO itemTypeFields VALUES (26, 62, NULL, 14);
+INSERT INTO itemTypeFields VALUES (26, 1, NULL, 15);
+INSERT INTO itemTypeFields VALUES (26, 27, NULL, 16);
+INSERT INTO itemTypeFields VALUES (26, 2, NULL, 17);
+INSERT INTO itemTypeFields VALUES (26, 22, NULL, 18);
+INSERT INTO itemTypeFields VALUES (27, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (27, 74, NULL, 2);
+INSERT INTO itemTypeFields VALUES (27, 14, NULL, 3);
+INSERT INTO itemTypeFields VALUES (27, 7, NULL, 4);
+INSERT INTO itemTypeFields VALUES (27, 75, NULL, 5);
+INSERT INTO itemTypeFields VALUES (27, 1, NULL, 6);
+INSERT INTO itemTypeFields VALUES (27, 27, NULL, 7);
+INSERT INTO itemTypeFields VALUES (27, 87, NULL, 8);
+INSERT INTO itemTypeFields VALUES (27, 2, NULL, 9);
+INSERT INTO itemTypeFields VALUES (27, 22, NULL, 10);
+INSERT INTO itemTypeFields VALUES (28, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (28, 63, NULL, 2);
+INSERT INTO itemTypeFields VALUES (28, 28, NULL, 3);
+INSERT INTO itemTypeFields VALUES (28, 4, NULL, 4);
+INSERT INTO itemTypeFields VALUES (28, 45, NULL, 5);
+INSERT INTO itemTypeFields VALUES (28, 7, NULL, 6);
+INSERT INTO itemTypeFields VALUES (28, 76, NULL, 7);
+INSERT INTO itemTypeFields VALUES (28, 14, NULL, 8);
+INSERT INTO itemTypeFields VALUES (28, 77, NULL, 9);
+INSERT INTO itemTypeFields VALUES (28, 87, NULL, 10);
+INSERT INTO itemTypeFields VALUES (28, 11, NULL, 11);
+INSERT INTO itemTypeFields VALUES (28, 18, NULL, 12);
+INSERT INTO itemTypeFields VALUES (28, 19, NULL, 13);
+INSERT INTO itemTypeFields VALUES (28, 62, NULL, 14);
+INSERT INTO itemTypeFields VALUES (28, 2, NULL, 15);
+INSERT INTO itemTypeFields VALUES (28, 1, NULL, 16);
+INSERT INTO itemTypeFields VALUES (28, 27, NULL, 17);
+INSERT INTO itemTypeFields VALUES (28, 22, NULL, 18);
+INSERT INTO itemTypeFields VALUES (29, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (29, 28, NULL, 2);
+INSERT INTO itemTypeFields VALUES (29, 60, NULL, 3);
+INSERT INTO itemTypeFields VALUES (29, 63, NULL, 4);
+INSERT INTO itemTypeFields VALUES (29, 7, NULL, 5);
+INSERT INTO itemTypeFields VALUES (29, 78, NULL, 6);
+INSERT INTO itemTypeFields VALUES (29, 14, NULL, 7);
+INSERT INTO itemTypeFields VALUES (29, 77, NULL, 8);
+INSERT INTO itemTypeFields VALUES (29, 87, NULL, 9);
+INSERT INTO itemTypeFields VALUES (29, 18, NULL, 10);
+INSERT INTO itemTypeFields VALUES (29, 19, NULL, 11);
+INSERT INTO itemTypeFields VALUES (29, 62, NULL, 12);
+INSERT INTO itemTypeFields VALUES (29, 1, NULL, 13);
+INSERT INTO itemTypeFields VALUES (29, 27, NULL, 14);
+INSERT INTO itemTypeFields VALUES (29, 2, NULL, 15);
+INSERT INTO itemTypeFields VALUES (29, 22, NULL, 16);
+INSERT INTO itemTypeFields VALUES (30, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (30, 28, NULL, 2);
+INSERT INTO itemTypeFields VALUES (30, 60, NULL, 3);
+INSERT INTO itemTypeFields VALUES (30, 71, NULL, 4);
+INSERT INTO itemTypeFields VALUES (30, 7, NULL, 5);
+INSERT INTO itemTypeFields VALUES (30, 78, NULL, 6);
+INSERT INTO itemTypeFields VALUES (30, 14, NULL, 7);
+INSERT INTO itemTypeFields VALUES (30, 77, NULL, 8);
+INSERT INTO itemTypeFields VALUES (30, 87, NULL, 9);
+INSERT INTO itemTypeFields VALUES (30, 18, NULL, 10);
+INSERT INTO itemTypeFields VALUES (30, 19, NULL, 11);
+INSERT INTO itemTypeFields VALUES (30, 62, NULL, 12);
+INSERT INTO itemTypeFields VALUES (30, 2, NULL, 13);
+INSERT INTO itemTypeFields VALUES (30, 1, NULL, 14);
+INSERT INTO itemTypeFields VALUES (30, 27, NULL, 15);
+INSERT INTO itemTypeFields VALUES (30, 22, NULL, 16);
+INSERT INTO itemTypeFields VALUES (31, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (31, 28, NULL, 2);
+INSERT INTO itemTypeFields VALUES (31, 60, NULL, 3);
+INSERT INTO itemTypeFields VALUES (31, 80, NULL, 4);
+INSERT INTO itemTypeFields VALUES (31, 77, NULL, 5);
+INSERT INTO itemTypeFields VALUES (31, 1, NULL, 6);
+INSERT INTO itemTypeFields VALUES (31, 27, NULL, 7);
+INSERT INTO itemTypeFields VALUES (31, 87, NULL, 8);
+INSERT INTO itemTypeFields VALUES (31, 2, NULL, 9);
+INSERT INTO itemTypeFields VALUES (31, 22, NULL, 10);
+INSERT INTO itemTypeFields VALUES (32, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (32, 28, NULL, 2);
+INSERT INTO itemTypeFields VALUES (32, 81, NULL, 3);
+INSERT INTO itemTypeFields VALUES (32, 82, NULL, 4);
+INSERT INTO itemTypeFields VALUES (32, 7, NULL, 5);
+INSERT INTO itemTypeFields VALUES (32, 83, NULL, 6);
+INSERT INTO itemTypeFields VALUES (32, 88, NULL, 7);
+INSERT INTO itemTypeFields VALUES (32, 11, NULL, 8);
+INSERT INTO itemTypeFields VALUES (32, 18, NULL, 9);
+INSERT INTO itemTypeFields VALUES (32, 19, NULL, 10);
+INSERT INTO itemTypeFields VALUES (32, 62, NULL, 11);
+INSERT INTO itemTypeFields VALUES (32, 1, NULL, 12);
+INSERT INTO itemTypeFields VALUES (32, 27, NULL, 13);
+INSERT INTO itemTypeFields VALUES (32, 2, NULL, 14);
+INSERT INTO itemTypeFields VALUES (32, 22, NULL, 15);
+INSERT INTO itemTypeFields VALUES (33, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (33, 14, NULL, 2);
+INSERT INTO itemTypeFields VALUES (33, 84, NULL, 3);
+INSERT INTO itemTypeFields VALUES (33, 7, NULL, 4);
+INSERT INTO itemTypeFields VALUES (33, 8, NULL, 5);
+INSERT INTO itemTypeFields VALUES (33, 4, NULL, 6);
+INSERT INTO itemTypeFields VALUES (33, 10, NULL, 7);
+INSERT INTO itemTypeFields VALUES (33, 3, NULL, 8);
+INSERT INTO itemTypeFields VALUES (33, 87, NULL, 9);
+INSERT INTO itemTypeFields VALUES (33, 26, NULL, 10);
+INSERT INTO itemTypeFields VALUES (33, 11, NULL, 11);
+INSERT INTO itemTypeFields VALUES (33, 18, NULL, 12);
+INSERT INTO itemTypeFields VALUES (33, 19, NULL, 13);
+INSERT INTO itemTypeFields VALUES (33, 62, NULL, 14);
+INSERT INTO itemTypeFields VALUES (33, 1, NULL, 15);
+INSERT INTO itemTypeFields VALUES (33, 27, NULL, 16);
+INSERT INTO itemTypeFields VALUES (33, 2, NULL, 17);
+INSERT INTO itemTypeFields VALUES (33, 22, NULL, 18);
+INSERT INTO itemTypeFields VALUES (34, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (34, 8, NULL, 2);
+INSERT INTO itemTypeFields VALUES (34, 14, NULL, 3);
+INSERT INTO itemTypeFields VALUES (34, 1, NULL, 4);
+INSERT INTO itemTypeFields VALUES (34, 27, NULL, 5);
+INSERT INTO itemTypeFields VALUES (34, 87, NULL, 6);
+INSERT INTO itemTypeFields VALUES (34, 18, NULL, 7);
+INSERT INTO itemTypeFields VALUES (34, 19, NULL, 8);
+INSERT INTO itemTypeFields VALUES (34, 62, NULL, 9);
+INSERT INTO itemTypeFields VALUES (34, 2, NULL, 10);
+INSERT INTO itemTypeFields VALUES (34, 22, NULL, 11);
+INSERT INTO itemTypeFields VALUES (35, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (35, 85, NULL, 2);
+INSERT INTO itemTypeFields VALUES (35, 3, NULL, 3);
+INSERT INTO itemTypeFields VALUES (35, 30, NULL, 4);
+INSERT INTO itemTypeFields VALUES (35, 4, NULL, 5);
+INSERT INTO itemTypeFields VALUES (35, 45, NULL, 6);
+INSERT INTO itemTypeFields VALUES (35, 6, NULL, 7);
+INSERT INTO itemTypeFields VALUES (35, 7, NULL, 8);
+INSERT INTO itemTypeFields VALUES (35, 8, NULL, 9);
+INSERT INTO itemTypeFields VALUES (35, 14, NULL, 10);
+INSERT INTO itemTypeFields VALUES (35, 10, NULL, 11);
+INSERT INTO itemTypeFields VALUES (35, 11, NULL, 12);
+INSERT INTO itemTypeFields VALUES (35, 1, NULL, 13);
+INSERT INTO itemTypeFields VALUES (35, 27, NULL, 14);
+INSERT INTO itemTypeFields VALUES (35, 87, NULL, 15);
+INSERT INTO itemTypeFields VALUES (35, 18, NULL, 16);
+INSERT INTO itemTypeFields VALUES (35, 19, NULL, 17);
+INSERT INTO itemTypeFields VALUES (35, 62, NULL, 18);
+INSERT INTO itemTypeFields VALUES (35, 2, NULL, 19);
+INSERT INTO itemTypeFields VALUES (35, 22, NULL, 20);
+INSERT INTO itemTypeFields VALUES (36, 90, NULL, 1);
+INSERT INTO itemTypeFields VALUES (36, 86, NULL, 2);
+INSERT INTO itemTypeFields VALUES (36, 3, NULL, 3);
+INSERT INTO itemTypeFields VALUES (36, 30, NULL, 4);
+INSERT INTO itemTypeFields VALUES (36, 4, NULL, 5);
+INSERT INTO itemTypeFields VALUES (36, 45, NULL, 6);
+INSERT INTO itemTypeFields VALUES (36, 6, NULL, 7);
+INSERT INTO itemTypeFields VALUES (36, 7, NULL, 8);
+INSERT INTO itemTypeFields VALUES (36, 8, NULL, 9);
+INSERT INTO itemTypeFields VALUES (36, 14, NULL, 10);
+INSERT INTO itemTypeFields VALUES (36, 10, NULL, 11);
+INSERT INTO itemTypeFields VALUES (36, 87, NULL, 12);
+INSERT INTO itemTypeFields VALUES (36, 11, NULL, 13);
+INSERT INTO itemTypeFields VALUES (36, 18, NULL, 14);
+INSERT INTO itemTypeFields VALUES (36, 19, NULL, 15);
+INSERT INTO itemTypeFields VALUES (36, 62, NULL, 16);
+INSERT INTO itemTypeFields VALUES (36, 1, NULL, 17);
+INSERT INTO itemTypeFields VALUES (36, 27, NULL, 18);
+INSERT INTO itemTypeFields VALUES (36, 2, NULL, 19);
+INSERT INTO itemTypeFields VALUES (36, 22, NULL, 20);
 
 INSERT INTO baseFieldMappings VALUES (26, 8, 72); -- audioRecording/publisher/label
 INSERT INTO baseFieldMappings VALUES (28, 8, 76); -- videoRecording/publisher/studio

userdata.sql

@@ -1,4 +1,4 @@
--- 18
+-- 19
 
 -- This file creates tables containing user-specific data -- any changes
 -- to existing tables made here must be mirrored in transition steps in
@@ -80,7 +80,6 @@ CREATE TABLE IF NOT EXISTS itemNotes (
     itemID INT,
     sourceItemID INT,
     note TEXT,
-    isAbstract INT DEFAULT NULL,
     PRIMARY KEY (itemID),
     FOREIGN KEY (itemID) REFERENCES items(itemID),
     FOREIGN KEY (sourceItemID) REFERENCES items(itemID)