suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #544, Can't add the word 'map' as a tag

Browse Source 
Words corresponding to JS Object/Array methods/properties couldn't be added as tags -- oops

Fixed for CachedTypes and ItemFields as well, just in case
This commit is contained in:
Dan Stillman 2007-02-28 20:01:34 +00:00
parent 3e2bb8a4d7
commit 7a9cc0f935
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
chrome/content/zotero/xpcom/data_access.js
View File

@ -3353,8 +3353,8 @@ Zotero.Tags = new function(){
* Returns the tagID matching given tag and type * Returns the tagID matching given tag and type
*/ */
function getID(tag, type) { function getID(tag, type) {
if (_tags[type] && _tags[type][tag]){ if (_tags[type] && _tags[type]['_' + tag]){
return _tags[type][tag]; return _tags[type]['_' + tag];
} }
var sql = 'SELECT tagID FROM tags WHERE tag=? AND tagType=?'; var sql = 'SELECT tagID FROM tags WHERE tag=? AND tagType=?';
@ -3364,7 +3364,7 @@ Zotero.Tags = new function(){
if (!_tags[type]) { if (!_tags[type]) {
_tags[type] = []; _tags[type] = [];
} }
_tags[type][tag] = tagID; _tags[type]['_' + tag] = tagID;
} }
return tagID; return tagID;
@ -3540,7 +3540,7 @@ Zotero.Tags = new function(){
var sql = "DELETE FROM tags WHERE tagID=?"; var sql = "DELETE FROM tags WHERE tagID=?";
Zotero.DB.query(sql, tagID); Zotero.DB.query(sql, tagID);
if (_tags[oldType]) { if (_tags[oldType]) {
delete _tags[oldType][oldName]; delete _tags[oldType]['_' + oldName];
} }
delete _tagsByID[tagID]; delete _tagsByID[tagID];
Zotero.Notifier.trigger('delete', 'tag', tagID, notifierData); Zotero.Notifier.trigger('delete', 'tag', tagID, notifierData);
@ -3573,7 +3573,7 @@ Zotero.Tags = new function(){
var itemIDs = this.getTagItems(tagID); var itemIDs = this.getTagItems(tagID);
if (_tags[oldType]) { if (_tags[oldType]) {
delete _tags[oldType][oldName]; delete _tags[oldType]['_' + oldName];
} }
delete _tagsByID[tagID]; delete _tagsByID[tagID];
@ -3637,7 +3637,7 @@ Zotero.Tags = new function(){
purged.push(tag.tagID); purged.push(tag.tagID);
if (_tags[tag.tagType]) { if (_tags[tag.tagType]) {
delete _tags[tag.tagType][tag.tag]; delete _tags[tag.tagType]['_' + tag.tag];
} }
delete _tagsByID[tag.tagID]; delete _tagsByID[tag.tagID];
} }
@ -3683,7 +3683,7 @@ Zotero.Tags = new function(){
* *
*/ */
Zotero.CachedTypes = function(){ Zotero.CachedTypes = function(){
var _types = new Array(); var _types = [];
var _typesLoaded; var _typesLoaded;
var self = this; var self = this;
@ -3708,12 +3708,12 @@ Zotero.CachedTypes = function(){
idOrName = idOrName.toLowerCase(); idOrName = idOrName.toLowerCase();
} }
if (!_types[idOrName]){ if (!_types['_' + idOrName]){
Zotero.debug('Invalid ' + this._typeDesc + ' ' + idOrName, 1); Zotero.debug('Invalid ' + this._typeDesc + ' ' + idOrName, 1);
return ''; return '';
} }
return _types[idOrName]['name']; return _types['_' + idOrName]['name'];
} }
@ -3727,12 +3727,12 @@ Zotero.CachedTypes = function(){
idOrName = idOrName.toLowerCase(); idOrName = idOrName.toLowerCase();
} }
if (!_types[idOrName]){ if (!_types['_' + idOrName]){
Zotero.debug('Invalid ' + this._typeDesc + ' ' + idOrName, 1); Zotero.debug('Invalid ' + this._typeDesc + ' ' + idOrName, 1);
return false; return false;
} }
return _types[idOrName]['id']; return _types['_' + idOrName]['id'];
} }
@ -3752,12 +3752,12 @@ Zotero.CachedTypes = function(){
id: types[i]['id'], id: types[i]['id'],
name: types[i]['name'] name: types[i]['name']
} }
_types[types[i]['id']] = typeData; _types['_' + types[i]['id']] = typeData;
if (self._ignoreCase){ if (self._ignoreCase){
_types[types[i]['name'].toLowerCase()] = _types[types[i]['id']]; _types['_' + types[i]['name'].toLowerCase()] = _types['_' + types[i]['id']];
} }
else { else {
_types[types[i]['name']] = _types[types[i]['id']]; _types['_' + types[i]['name']] = _types['_' + types[i]['id']];
} }
} }
@ -3913,9 +3913,10 @@ Zotero.CharacterSets = new function(){
Zotero.ItemFields = new function(){ Zotero.ItemFields = new function(){
// Private members // Private members
var _fields = new Array(); var _fields = [];
var _fieldFormats = new Array(); var _fieldsLoaded;
var _itemTypeFields = new Array(); var _fieldFormats = [];
var _itemTypeFields = [];
var self = this; var self = this;
@ -3937,10 +3938,10 @@ Zotero.ItemFields = new function(){
* Return the fieldID for a passed fieldID or fieldName * Return the fieldID for a passed fieldID or fieldName
*/ */
function getID(field){ function getID(field){
if (!_fields.length){ if (!_fieldsLoaded){
_loadFields(); _loadFields();
} }
return _fields[field] ? _fields[field]['id'] : false; return _fields['_' + field] ? _fields['_' + field]['id'] : false;
} }
@ -3948,10 +3949,10 @@ Zotero.ItemFields = new function(){
* Return the fieldName for a passed fieldID or fieldName * Return the fieldName for a passed fieldID or fieldName
*/ */
function getName(field){ function getName(field){
if (!_fields.length){ if (!_fieldsLoaded){
_loadFields(); _loadFields();
} }
return _fields[field] ? _fields[field]['name'] : false; return _fields['_' + field] ? _fields['_' + field]['name'] : false;
} }
@ -3973,28 +3974,28 @@ Zotero.ItemFields = new function(){
function isValidForType(fieldID, itemTypeID){ function isValidForType(fieldID, itemTypeID){
if (!_fields.length){ if (!_fieldsLoaded){
_loadFields(); _loadFields();
} }
_fieldCheck(fieldID, 'isValidForType'); _fieldCheck(fieldID, 'isValidForType');
if (!_fields[fieldID]['itemTypes']){ if (!_fields['_' + fieldID]['itemTypes']){
return false; return false;
} }
return !!_fields[fieldID]['itemTypes'][itemTypeID]; return !!_fields['_' + fieldID]['itemTypes'][itemTypeID];
} }
function isInteger(fieldID){ function isInteger(fieldID){
if (!_fields.length){ if (!_fieldsLoaded){
_loadFields(); _loadFields();
} }
_fieldCheck(fieldID, 'isInteger'); _fieldCheck(fieldID, 'isInteger');
var ffid = _fields[fieldID]['formatID']; var ffid = _fields['_' + fieldID]['formatID'];
return _fieldFormats[ffid] ? _fieldFormats[ffid]['isInteger'] : false; return _fieldFormats[ffid] ? _fieldFormats[ffid]['isInteger'] : false;
} }
@ -4178,15 +4179,17 @@ Zotero.ItemFields = new function(){
var fieldItemTypes = _getFieldItemTypes(); var fieldItemTypes = _getFieldItemTypes();
for (i=0,len=result.length; i<len; i++){ for (i=0,len=result.length; i<len; i++){
_fields[result[i]['fieldID']] = { _fields['_' + result[i]['fieldID']] = {
id: result[i]['fieldID'], id: result[i]['fieldID'],
name: result[i]['fieldName'], name: result[i]['fieldName'],
formatID: result[i]['fieldFormatID'], formatID: result[i]['fieldFormatID'],
itemTypes: fieldItemTypes[result[i]['fieldID']] itemTypes: fieldItemTypes[result[i]['fieldID']]
}; };
// Store by name as well as id // Store by name as well as id
_fields[result[i]['fieldName']] = _fields[result[i]['fieldID']]; _fields['_' + result[i]['fieldName']] = _fields['_' + result[i]['fieldID']];
} }
_fieldsLoaded = true;
} }
} }