From: phasefx Date: Sun, 17 Jul 2005 15:21:25 +0000 (+0000) Subject: changes need to force legacy code work X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3f6c8ac8c7e733c6eb31a9ad8b967f72a7a3112d;p=Evergreen.git changes need to force legacy code work git-svn-id: svn://svn.open-ils.org/ILS/trunk@1243 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js index e0654dd191..a518bce62d 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js @@ -8,7 +8,7 @@ var orgs_with_copies_hash = {}; function my_init() { timer_init('cat'); - dump('TESTING: browse_list.js: ' + mw.G['main_test_variable'] + '\n'); + mw.sdump('D_CAT','TESTING: browse_list.js: ' + mw.G['main_test_variable'] + '\n'); var tc = document.getElementById('browse_list_tree_children'); build_tree_branch(tc,mw.G['org_tree'],true); my_treerow = document.getElementById( 'org_unit_' + mw.G.user_ou.shortname() ).firstChild; @@ -19,7 +19,7 @@ function my_init() { } function refresh_browse_list() { - dump('=-=-=-=-=-=-=-=-=\n\n\nrefresh_browse_list()\n'); + mw.sdump('D_CAT','=-=-=-=-=-=-=-=-=\n\n\nrefresh_browse_list()\n'); // Prune tree var nl = document.getElementsByTagName('treeitem'); for (var i = 0; i < nl.length; i++) { @@ -42,7 +42,7 @@ function button_toggle_my_libraries(ev) { // label = Hide My Libraries // alt_label = Show My Libraries var target = document.getElementById('browse_list_button1'); - if (!target) { dump('eh?\n'); return; } + if (!target) { mw.sdump('D_CAT','eh?\n'); return; } swap_attributes('browse_list_button1','label','alt_label'); var toggle = cycle_attribute( target,'toggle', [ '1', '2' ] ); for (var i in mw.G.my_orgs) { @@ -62,11 +62,11 @@ function button_toggle_libraries(ev) { // label = Show Other Libraries With Copies // alt_label = Show Just My Libraries var target = document.getElementById('browse_list_button2'); - if (!target) { dump('eh?\n'); return; } + if (!target) { mw.sdump('D_CAT','eh?\n'); return; } swap_attributes('browse_list_button2','label','alt_label'); var toggle = cycle_attribute( target,'toggle',['1','2'] ); if (toggle == '1') { - dump('Showing just my libraries...\n'); + mw.sdump('D_CAT','Showing just my libraries...\n'); /*hide_branch( document.getElementById('org_unit_PINES') ); for (var i = 0; i < mw.G.my_orgs.length; i++) { unhide_branch( @@ -86,17 +86,17 @@ function button_toggle_libraries(ev) { } } } else { - dump('Showing other libraries with copies...\n'); + mw.sdump('D_CAT','Showing other libraries with copies...\n'); var nl = document.getElementsByTagName('treeitem'); for (var i = 0; i < nl.length; i++) { var item = nl[i]; if (item.getAttribute('copies') == 'true') { //item.setAttribute('hidden','false'); - //dump('\tunhiding ' + item.getAttribute('id') + '\n'); + //mw.sdump('D_CAT','\tunhiding ' + item.getAttribute('id') + '\n'); unhide_branch(item); } else { //item.setAttribute('hidden','true'); - //dump('\thiding ' + item.getAttribute('id') + '\n'); + //mw.sdump('D_CAT','\thiding ' + item.getAttribute('id') + '\n'); //hide_branch(item); } } @@ -106,7 +106,7 @@ function button_toggle_libraries(ev) { function unhide_branch(item,do_open,do_copies) { if (item.getAttribute('id') == 'org_unit_PINES') { return; } - //dump('Unhiding ' + item.getAttribute('id') + '\n'); + //mw.sdump('D_CAT','Unhiding ' + item.getAttribute('id') + '\n'); item.setAttribute('hidden','false'); if (do_open) { item.setAttribute('open','true'); @@ -124,7 +124,7 @@ function unhide_branch(item,do_open,do_copies) { function hide_branch(item,do_open,do_copies) { if (item.getAttribute('id') == 'org_unit_PINES') { return; } - //dump('Hiding ' + item.getAttribute('id') + '\n'); + //mw.sdump('D_CAT','Hiding ' + item.getAttribute('id') + '\n'); item.setAttribute('hidden','true'); if (do_open) { item.setAttribute('open','false'); @@ -142,7 +142,7 @@ function hide_branch(item,do_open,do_copies) { function gather_copies() { // loop the libs - dump('Hello : ' + timer_elapsed('world') + '\n'); + mw.sdump('D_CAT','Hello : ' + timer_elapsed('world') + '\n'); /* user_async_request( 'open-ils.cat', 'open-ils.cat.asset.copy_tree.global.retrieve', @@ -177,7 +177,7 @@ function gather_copies() { gather_other_copies(); } ); - dump('((((((((((((((((( Count = ' + counter_incr('world') + '\n'); + mw.sdump('D_CAT','((((((((((((((((( Count = ' + counter_incr('world') + '\n'); } function gather_other_copies() { @@ -199,7 +199,7 @@ function gather_other_copies() { [ mw.G['auth_ses'][0], find_this_id, bucket ], gather_copies_callback ); - dump('((((((((((((((((( Count = ' + counter_incr('world') + '\n'); + mw.sdump('D_CAT','((((((((((((((((( Count = ' + counter_incr('world') + '\n'); bucket = new Array(); c_s = 0; } @@ -211,16 +211,16 @@ function gather_other_copies() { [ mw.G['auth_ses'][0], find_this_id, bucket ], gather_copies_callback ); - dump('((((((((((((((((( Count = ' + counter_incr('world') + '\n'); + mw.sdump('D_CAT','((((((((((((((((( Count = ' + counter_incr('world') + '\n'); } browse_meter_per = 100 / counter_peek('world'); - dump(timer_elapsed('world') + ' : World : ' + timer_elapsed('gather') + '\n'); + mw.sdump('D_CAT',timer_elapsed('world') + ' : World : ' + timer_elapsed('gather') + '\n'); } function find_my_treerow_index() { var nl = document.getElementById('browse_list_tree').getElementsByTagName('treerow'); var count = 0; - //dump('find_my_treerow: count = ' + count + ' nl.length = ' + nl.length + '\n'); + //mw.sdump('D_CAT','find_my_treerow: count = ' + count + ' nl.length = ' + nl.length + '\n'); for (var i = 0; i < nl.length; i++) { var row = nl[i]; var item = row.parentNode; @@ -229,7 +229,7 @@ function find_my_treerow_index() { } var open_attr = item.getAttribute('open'); var hidden_prop = item.hidden; - //dump('id = ' + item.getAttribute('id') + ' hidden_attr = ' + hidden_attr + ' hidden_prop = ' + hidden_prop + '\n'); + //mw.sdump('D_CAT','id = ' + item.getAttribute('id') + ' hidden_attr = ' + hidden_attr + ' hidden_prop = ' + hidden_prop + '\n'); if (hidden_prop.toString() == 'false' && open_attr.toString() == 'true') { count++; } @@ -238,23 +238,23 @@ function find_my_treerow_index() { } function gather_copies_callback(request) { - dump('gather_copies_callback : ' + timer_elapsed('gather') + ' : ' + ' count = ' + counter_incr('gather') + '\n'); + mw.sdump('D_CAT','gather_copies_callback : ' + timer_elapsed('gather') + ' : ' + ' count = ' + counter_incr('gather') + '\n'); var result = request.getResultObject(); var n_volumes = 0; var n_copies = 0; var flag = false; - //dump('copybrowser result = ' + js2JSON(result) + '\n=-=-=\n'); + //mw.sdump('D_CAT','copybrowser result = ' + js2JSON(result) + '\n=-=-=\n'); for (var y in result) { if (result[y] && (typeof(result[y])=='object')) { var volume = result[y]; n_volumes++; - //dump('\nvolume = ' + js2JSON(volume) + '\n'); - dump(' volume id = ' + volume.id() + '\n'); + //mw.sdump('D_CAT','\nvolume = ' + js2JSON(volume) + '\n'); + mw.sdump('D_CAT',' volume id = ' + volume.id() + '\n'); var lib = find_ou( mw.G.org_tree, volume.owning_lib() ); - //dump('lib = ' + js2JSON(lib) + '\n'); + //mw.sdump('D_CAT','lib = ' + js2JSON(lib) + '\n'); if ( lib.shortname() == mw.G.user_ou.shortname() ) { flag = true; } var callnumber = volume.label(); var copies = volume.copies(); - //dump('\tcopies = ' + js2JSON(copies) + '\n'); + //mw.sdump('D_CAT','\tcopies = ' + js2JSON(copies) + '\n'); var item = document.getElementById('org_unit_'+lib.shortname()); - if (!item) { dump('skipping\n'); continue; } + if (!item) { mw.sdump('D_CAT','skipping\n'); continue; } var item_row = item.firstChild; var volumes_treecell; @@ -314,10 +314,10 @@ function gather_copies_callback(request) { var treechildren = document.createElement('treechildren'); cn_treeitem.appendChild(treechildren); - //dump( 'org_unit_'+lib+' item = '+item.tagName+'\n'); + //mw.sdump('D_CAT', 'org_unit_'+lib+' item = '+item.tagName+'\n'); for (var j = 0; j < copies.length; j++) { var copy = copies[j]; n_copies++; - //dump('barcode: ' + copy.barcode() + '\n'); + //mw.sdump('D_CAT','barcode: ' + copy.barcode() + '\n'); var treeitem = document.createElement('treeitem'); treeitem.setAttribute('open','true'); @@ -357,19 +357,19 @@ function gather_copies_callback(request) { } } else { - dump('gather_copies problem: ' + result[y] + '\n'); + mw.sdump('D_CAT','gather_copies problem: ' + result[y] + '\n'); //throw(result[0]); } } var tree = document.getElementById('browse_list_tree'); if (tree.currentIndex != -1) { - //dump('currentIndex != -1 = ' + tree.currentIndex + '\n'); + //mw.sdump('D_CAT','currentIndex != -1 = ' + tree.currentIndex + '\n'); //tree.treeBoxObject.scrollToRow( tree.currentIndex ); tree.treeBoxObject.ensureRowIsVisible( tree.currentIndex ); } else if (flag) { - //dump('currentIndex == -1\n'); + //mw.sdump('D_CAT','currentIndex == -1\n'); var find = find_my_treerow_index(); - dump('find = ' + find + ' n_volumes = ' + n_volumes + ' n_copies = ' + n_copies + '\n'); + mw.sdump('D_CAT','find = ' + find + ' n_volumes = ' + n_volumes + ' n_copies = ' + n_copies + '\n'); //alert('find = ' + find + ' n_volumes = ' + n_volumes + ' n_copies = ' + n_copies + '\n'); if (find > 0) { find = find + n_volumes + n_copies; @@ -387,7 +387,7 @@ function gather_copies_callback(request) { meter.value = 100; meter.setAttribute('hidden','true'); } - dump('gather callback done : ' + timer_elapsed('gather') + '\n'); + mw.sdump('D_CAT','gather callback done : ' + timer_elapsed('gather') + '\n'); } @@ -455,8 +455,8 @@ function get_selected_rows_by_object_type(tree,object_type) { } function build_CopyBrowser_Context(ev) { - dump('build_CopyBrowser_Context: ev.target.tagName = ' + ev.target.tagName + '\n'); - dump('this = ' + this.tagName + '\n'); + mw.sdump('D_CAT','build_CopyBrowser_Context: ev.target.tagName = ' + ev.target.tagName + '\n'); + mw.sdump('D_CAT','this = ' + this.tagName + '\n'); var popup = document.getElementById('browse_menu'); empty_widget(popup); @@ -470,7 +470,7 @@ function build_CopyBrowser_Context(ev) { hitlist.view.selection.getRangeAt(t,start,end); for (var v=start.value; v<=end.value; v++){ var i = hitlist.contentView.getItemAtIndex(v); - //dump(i + ':' + i.firstChild.childNodes.length + '\n'); + //mw.sdump('D_CAT',i + ':' + i.firstChild.childNodes.length + '\n'); switch( i.getAttribute('object_type') ) { case 'volume' : volume_flag++; break; case 'copy' : copy_flag++; break; @@ -478,7 +478,7 @@ function build_CopyBrowser_Context(ev) { } } } - dump('volume_flag = ' + volume_flag + ' copy_flag = ' + copy_flag + ' library_flag = ' + library_flag + '\n'); + mw.sdump('D_CAT','volume_flag = ' + volume_flag + ' copy_flag = ' + copy_flag + ' library_flag = ' + library_flag + '\n'); if (library_flag > 0) { var menuitem = document.createElement('menuitem'); popup.appendChild(menuitem); @@ -545,7 +545,7 @@ function build_CopyBrowser_Context(ev) { } function volume_add(tab,params) { - dump('trying to volume_add()\n'); + mw.sdump('D_CAT','trying to volume_add()\n'); params['shortcut'] = 'volume_add'; var w; //var items = get_selected_rows(tree); @@ -563,14 +563,14 @@ function volume_add(tab,params) { } else { w = mw.new_window( chrome ); } - dump('setting use_this_tree\n'); + mw.sdump('D_CAT','setting use_this_tree\n'); w.tree_items = items; w.record_id = find_this_id; w.params = params; } function copy_add(tab,params) { - dump('trying to copy_add()\n'); + mw.sdump('D_CAT','trying to copy_add()\n'); params['shortcut'] = 'copy_add'; var w; //var items = get_selected_rows(tree); @@ -588,14 +588,14 @@ function copy_add(tab,params) { } else { w = mw.new_window( chrome ); } - dump('setting use_this_tree\n'); + mw.sdump('D_CAT','setting use_this_tree\n'); w.tree_items = items; w.record_id = find_this_id; w.params = params; } function volume_edit(tab,params) { - dump('trying to volume_edit()\n'); + mw.sdump('D_CAT','trying to volume_edit()\n'); params['shortcut'] = 'volume_edit'; var w; //var items = get_selected_rows(tree); @@ -613,7 +613,7 @@ function volume_edit(tab,params) { } else { w = mw.new_window( chrome ); } - dump('setting use_this_tree\n'); + mw.sdump('D_CAT','setting use_this_tree\n'); w.tree_items = items; w.record_id = find_this_id; w.params = params; @@ -634,7 +634,7 @@ function volume_delete(tab,params) { 'open-ils.cat.asset.volume_tree.fleshed.batch.update', [ mw.G['auth_ses'][0], cn_list] ); - dump('volume_tree.fleshed.batch.update result: ' + js2JSON(result) + '\n'); + mw.sdump('D_CAT','volume_tree.fleshed.batch.update result: ' + js2JSON(result) + '\n'); refresh_browse_list(); } @@ -657,6 +657,6 @@ function copy_delete(tab,params) { 'open-ils.cat.asset.volume_tree.fleshed.batch.update', [ mw.G['auth_ses'][0], cn_list] ); - dump('volume_tree.fleshed.batch.update result: ' + js2JSON(result) + '\n'); + mw.sdump('D_CAT','volume_tree.fleshed.batch.update result: ' + js2JSON(result) + '\n'); refresh_browse_list(); } diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.xul index 0084facd37..5358ae4479 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.xul @@ -16,8 +16,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul index 6fd2212c3b..c3b527e7bf 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul @@ -17,7 +17,7 @@ - + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/cat.js b/Evergreen/staff_client/chrome/content/evergreen/cat/cat.js index 031783b565..58749906e9 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/cat.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/cat.js @@ -1,6 +1,6 @@ function my_init() { document.getElementById('search-entry-box').focus(); - dump('TESTING: cat.js: ' + mw.G['main_test_variable'] + '\n'); + mw.sdump('D_CAT','TESTING: cat.js: ' + mw.G['main_test_variable'] + '\n'); populate_lib_list( 'search-copy-count-menu', 'search-copy-count-popup', @@ -37,9 +37,9 @@ function search(s_type, s_loc, s_fmt, s_ord, s_term) { frame.contentWindow.tabWindow = tabWindow; frame.contentWindow.mw = mw; frame.contentWindow.am_i_a_top_level_tab = false; - dump('here ====>\n'); - frame.contentWindow.addEventListener('load',function (e) { dump('here1<==\n'); this.test_hash['hello1'] = 'boo'; }, false); - frame.contentWindow.addEventListener('load',function (e) { dump('here2<==\n'); this.test_hash['hello2'] = 'boo'; }, false); + mw.sdump('D_CAT','here ====>\n'); + frame.contentWindow.addEventListener('load',function (e) { mw.sdump('D_CAT','here1<==\n'); this.test_hash['hello1'] = 'boo'; }, false); + frame.contentWindow.addEventListener('load',function (e) { mw.sdump('D_CAT','here2<==\n'); this.test_hash['hello2'] = 'boo'; }, false); break; case 'isbn': alert('Not Yet Implemented'); diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/cat.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/cat.xul index 9685fa4e1e..dddaba1942 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/cat.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/cat.xul @@ -16,8 +16,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/copy.js b/Evergreen/staff_client/chrome/content/evergreen/cat/copy.js index e9b9418956..80f3040cc9 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/copy.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/copy.js @@ -2,17 +2,17 @@ var local_stat_cats; var local_stat_cat_entries = {}; function my_init() { - dump('entering my_init for copy.js\n'); - dump('TESTING: copy.js: ' + mw.G['main_test_variable'] + '\n'); - dump('real_parentWindow: ' + real_parentWindow + '\n'); + mw.sdump('D_CAT','entering my_init for copy.js\n'); + mw.sdump('D_CAT','TESTING: copy.js: ' + mw.G['main_test_variable'] + '\n'); + mw.sdump('D_CAT','real_parentWindow: ' + real_parentWindow + '\n'); populate_copy_status_list('copy-status-menu','copy-status-popup','0'); populate_copy_location_list('shelving-location-menu','shelving-location-popup'); populate_lib_list_with_branch('circulating-library-menu','circulating-library-popup', mw.G.user_ou, mw.G.org_tree, true ); - dump('super_dump cn_list = ' + super_dump_norecurse(cn_list) + '\n'); - dump('my_init: cn_list = ' + js2JSON(cn_list) + '\n'); + mw.sdump('D_CAT','super_dump cn_list = ' + super_dump_norecurse(cn_list) + '\n'); + mw.sdump('D_CAT','my_init: cn_list = ' + js2JSON(cn_list) + '\n'); /*cn_list = fixJSON(cn_list); - dump('super_dump cn_list = ' + super_dump_norecurse(cn_list) + '\n'); - dump('my_init: cn_list = ' + js2JSON(cn_list) + '\n');*/ + mw.sdump('D_CAT','super_dump cn_list = ' + super_dump_norecurse(cn_list) + '\n'); + mw.sdump('D_CAT','my_init: cn_list = ' + js2JSON(cn_list) + '\n');*/ var pertinent_libs = []; for (var i = 0; i < cn_list.length; i++) { var cn = cn_list[i]; @@ -45,7 +45,7 @@ function my_init() { function transfer_attributes(event) { var items = event.target.selectedItems; - dump('selectedItems.length = ' + items.length + '\n'); + mw.sdump('D_CAT','selectedItems.length = ' + items.length + '\n'); if (items.length == 0) { return; } // Dump items @@ -58,9 +58,9 @@ function transfer_attributes(event) { } ); for (var i in dump_copies) { - dump('\n\n\n,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_\n\n\n'); - dump( js2JSON(dump_copies[i]) ); - dump('\n\n\n,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_\n\n\n'); + mw.sdump('D_CAT','\n\n\n,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_\n\n\n'); + mw.sdump('D_CAT', js2JSON(dump_copies[i]) ); + mw.sdump('D_CAT','\n\n\n,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_\n\n\n'); } // Transfer values from first item to XUL @@ -99,7 +99,7 @@ function transfer_attributes(event) { menuitem.parentNode.parentNode.selectedItem = menuitem; } } - dump('select fired\n'); + mw.sdump('D_CAT','select fired\n'); } @@ -123,7 +123,7 @@ function apply_attributes() { var opac = document.getElementById('opac_visible_menu').value; var listbox = document.getElementById('ephemeral_listbox'); var items = listbox.selectedItems; - dump('selectedItems.length = ' + items.length + '\n'); + mw.sdump('D_CAT','selectedItems.length = ' + items.length + '\n'); for (var i = 0; i < items.length; i++) { var listitem = items[i]; var cn_pos = listitem.getAttribute('cn_pos'); @@ -143,19 +143,19 @@ function apply_attributes() { copy_node.ischanged(1); } - dump('changed cn_list: ' + js2JSON(cn_list) + '\n'); + mw.sdump('D_CAT','changed cn_list: ' + js2JSON(cn_list) + '\n'); } function apply_attribute(ev) { - dump('Entering apply_attribute with element id = '); + mw.sdump('D_CAT','Entering apply_attribute with element id = '); var popup_id; if (ev.target.tagName == 'menuitem') { popup_id = ev.target.parentNode.getAttribute('id'); } else { popup_id = ev.target.getAttribute('id'); } - dump(popup_id + '\n'); - dump('ev.target = ' + ev.target + ' .tagName = ' + ev.target.tagName + '\n'); + mw.sdump('D_CAT',popup_id + '\n'); + mw.sdump('D_CAT','ev.target = ' + ev.target + ' .tagName = ' + ev.target.tagName + '\n'); var circ_lib = document.getElementById('circulating-library-menu').value; var shelving_loc = document.getElementById('shelving-location-menu').value; @@ -171,93 +171,93 @@ function apply_attribute(ev) { var listbox = document.getElementById('ephemeral_listbox'); var items = listbox.selectedItems; - dump('selectedItems.length = ' + items.length + '\n'); - dump('before cn_list: ' + js2JSON(cn_list) + '\n'); + mw.sdump('D_CAT','selectedItems.length = ' + items.length + '\n'); + mw.sdump('D_CAT','before cn_list: ' + js2JSON(cn_list) + '\n'); for (var i = 0; i < items.length; i++) { var listitem = items[i]; var cn_pos = listitem.getAttribute('cn_pos'); var cp_pos = listitem.getAttribute('cp_pos'); var copy_node = cn_list[cn_pos].copies()[cp_pos]; - dump('\n\n\n\n+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+\n\n\n\n'); - dump('Setting copy ' + copy_node.id() + '...\n'); + mw.sdump('D_CAT','\n\n\n\n+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+\n\n\n\n'); + mw.sdump('D_CAT','Setting copy ' + copy_node.id() + '...\n'); switch(popup_id) { case 'circulating-library-popup': - dump('\tbefore circ_lib = ' + js2JSON(copy_node.circ_lib()) + '\n'); + mw.sdump('D_CAT','\tbefore circ_lib = ' + js2JSON(copy_node.circ_lib()) + '\n'); copy_node.circ_lib( mw.G.org_tree_hash[ circ_lib ] ); - dump('\tafter circ_lib = ' + js2JSON(copy_node.circ_lib()) + '\n'); + mw.sdump('D_CAT','\tafter circ_lib = ' + js2JSON(copy_node.circ_lib()) + '\n'); break; case 'shelving-location-popup': - dump('\tbefore location = ' + js2JSON(copy_node.location()) + '\n'); + mw.sdump('D_CAT','\tbefore location = ' + js2JSON(copy_node.location()) + '\n'); copy_node.location( mw.G.acpl_hash[ shelving_loc ] ); - dump('\tafter location = ' + js2JSON(copy_node.location()) + '\n'); + mw.sdump('D_CAT','\tafter location = ' + js2JSON(copy_node.location()) + '\n'); break; case 'copy-status-popup': - dump('\tbefore status = ' + js2JSON(copy_node.status()) + '\n'); + mw.sdump('D_CAT','\tbefore status = ' + js2JSON(copy_node.status()) + '\n'); copy_node.status( mw.G.ccs_hash[ copy_status ]); - dump('\tafter status = ' + js2JSON(copy_node.status()) + '\n'); + mw.sdump('D_CAT','\tafter status = ' + js2JSON(copy_node.status()) + '\n'); break; case 'loan-duration-popup': - dump('\tbefore loan_duration = ' + js2JSON(copy_node.loan_duration()) + '\n'); + mw.sdump('D_CAT','\tbefore loan_duration = ' + js2JSON(copy_node.loan_duration()) + '\n'); copy_node.loan_duration(loan_duration); - dump('\tafter loan_duration = ' + js2JSON(copy_node.loan_duration()) + '\n'); + mw.sdump('D_CAT','\tafter loan_duration = ' + js2JSON(copy_node.loan_duration()) + '\n'); break; case 'fine-level-popup': - dump('\tbefore fine_level = ' + js2JSON(copy_node.fine_level()) + '\n'); + mw.sdump('D_CAT','\tbefore fine_level = ' + js2JSON(copy_node.fine_level()) + '\n'); copy_node.fine_level(fine_level); - dump('\tafter fine_level = ' + js2JSON(copy_node.fine_level()) + '\n'); + mw.sdump('D_CAT','\tafter fine_level = ' + js2JSON(copy_node.fine_level()) + '\n'); break; case 'circulate_popup': - dump('\tbefore circulate = ' + js2JSON(copy_node.circulate()) + '\n'); + mw.sdump('D_CAT','\tbefore circulate = ' + js2JSON(copy_node.circulate()) + '\n'); copy_node.circulate(circulate); - dump('\tafter circulate = ' + js2JSON(copy_node.circulate()) + '\n'); + mw.sdump('D_CAT','\tafter circulate = ' + js2JSON(copy_node.circulate()) + '\n'); break; case 'deposit_popup': - dump('\tbefore deposit = ' + js2JSON(copy_node.deposit()) + '\n'); + mw.sdump('D_CAT','\tbefore deposit = ' + js2JSON(copy_node.deposit()) + '\n'); copy_node.deposit(deposit); - dump('\tafter deposit = ' + js2JSON(copy_node.deposit()) + '\n'); + mw.sdump('D_CAT','\tafter deposit = ' + js2JSON(copy_node.deposit()) + '\n'); break; case 'deposit_amount': - dump('\tbefore deposit_amount = ' + js2JSON(copy_node.deposit_amount()) + '\n'); + mw.sdump('D_CAT','\tbefore deposit_amount = ' + js2JSON(copy_node.deposit_amount()) + '\n'); copy_node.deposit_amount(deposit_amount); - dump('\tafter deposit_amount = ' + js2JSON(copy_node.deposit_amount()) + '\n'); + mw.sdump('D_CAT','\tafter deposit_amount = ' + js2JSON(copy_node.deposit_amount()) + '\n'); break; case 'price': - dump('\tbefore price = ' + js2JSON(copy_node.price()) + '\n'); + mw.sdump('D_CAT','\tbefore price = ' + js2JSON(copy_node.price()) + '\n'); copy_node.price(price); - dump('\tafter price = ' + js2JSON(copy_node.price()) + '\n'); + mw.sdump('D_CAT','\tafter price = ' + js2JSON(copy_node.price()) + '\n'); break; case 'reference_popup': - dump('\tbefore ref = ' + js2JSON(copy_node.ref()) + '\n'); + mw.sdump('D_CAT','\tbefore ref = ' + js2JSON(copy_node.ref()) + '\n'); copy_node.ref(ref); - dump('\tafter ref = ' + js2JSON(copy_node.ref()) + '\n'); + mw.sdump('D_CAT','\tafter ref = ' + js2JSON(copy_node.ref()) + '\n'); break; case 'opac_visible_popup': - dump('\tbefore opac_visible = ' + js2JSON(copy_node.opac_visible()) + '\n'); + mw.sdump('D_CAT','\tbefore opac_visible = ' + js2JSON(copy_node.opac_visible()) + '\n'); copy_node.opac_visible(opac); - dump('\tafter opac_visible = ' + js2JSON(copy_node.opac_visible()) + '\n'); + mw.sdump('D_CAT','\tafter opac_visible = ' + js2JSON(copy_node.opac_visible()) + '\n'); break; default: - dump('\t++++++++ Unhandled.. this should be a stat_cat: ' + popup_id + ' / ' + ev.target.tagName + '\n'); + mw.sdump('D_CAT','\t++++++++ Unhandled.. this should be a stat_cat: ' + popup_id + ' / ' + ev.target.tagName + '\n'); update_stat_cat_entry(copy_node,ev.target); break; } - dump('\n\n\n\n+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+\n\n\n\n'); + mw.sdump('D_CAT','\n\n\n\n+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+\n\n\n\n'); copy_node.ischanged(1); } - dump('changed cn_list: ' + js2JSON(cn_list) + '\n'); + mw.sdump('D_CAT','changed cn_list: ' + js2JSON(cn_list) + '\n'); } function update_stat_cat_entry(copy,menuitem) { - dump('\tupdate_stat_cat_entry: value = ' + menuitem.value + '\n'); + mw.sdump('D_CAT','\tupdate_stat_cat_entry: value = ' + menuitem.value + '\n'); var entries = copy.stat_cat_entries(); - //dump('\n\n\ncopy = ' + js2JSON(copy) + '\n'); - //dump('\n\n\ncopy.stat_cat_entries() = ' + js2JSON(copy.stat_cat_entries()) + '\n'); + //mw.sdump('D_CAT','\n\n\ncopy = ' + js2JSON(copy) + '\n'); + //mw.sdump('D_CAT','\n\n\ncopy.stat_cat_entries() = ' + js2JSON(copy.stat_cat_entries()) + '\n'); var stat_cat_id = menuitem.getAttribute('stat_cat'); var entry = find_attr_object_in_list(entries,'stat_cat',stat_cat_id); if (entry) { - dump('\tReplacing old stat_cat_entry with '); + mw.sdump('D_CAT','\tReplacing old stat_cat_entry with '); entries = filter_list( entries, @@ -267,15 +267,15 @@ function update_stat_cat_entry(copy,menuitem) { ); } else { - dump('\tAppending new stat_cat_entry = '); + mw.sdump('D_CAT','\tAppending new stat_cat_entry = '); } - dump(js2JSON(local_stat_cat_entries[menuitem.value]) + '\n'); + mw.sdump('D_CAT',js2JSON(local_stat_cat_entries[menuitem.value]) + '\n'); entries.push( local_stat_cat_entries[ menuitem.value ] ); copy.stat_cat_entries( entries ); } function add_to_listbox(cn_pos,cp_pos,name,callnumber,barcode) { - dump('xul: name = ' + name + ' cn = ' + callnumber + ' bc = ' + barcode + '\n'); + mw.sdump('D_CAT','xul: name = ' + name + ' cn = ' + callnumber + ' bc = ' + barcode + '\n'); var listbox = document.getElementById('ephemeral_listbox'); var listitem = document.createElement('listitem'); listitem.setAttribute('cn_pos',cn_pos); diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/copy.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/copy.xul index 863d9919cb..d083ca1ace 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/copy.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/copy.xul @@ -13,21 +13,17 @@ - - + + - diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/copy_add_wizard.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/copy_add_wizard.xul index dbe8abb498..2c3c323e11 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/copy_add_wizard.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/copy_add_wizard.xul @@ -9,8 +9,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/copy_display.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/copy_display.xul index ccb841c321..8bb7753f19 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/copy_display.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/copy_display.xul @@ -9,8 +9,8 @@ - - + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.js b/Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.js index 9e1e0d9cdd..a0aef179d7 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.js @@ -1,31 +1,31 @@ var cn_list; function copy_edit_init() { - dump('entering my_init for copy_edit.js\n'); - dump('TESTING: copy_edit.js: ' + mw.G['main_test_variable'] + '\n'); - dump('Gathering copies to put in the acn object...\n'); + mw.sdump('D_CAT','entering my_init for copy_edit.js\n'); + mw.sdump('D_CAT','TESTING: copy_edit.js: ' + mw.G['main_test_variable'] + '\n'); + mw.sdump('D_CAT','Gathering copies to put in the acn object...\n'); var list = get_list_from_tree_selection( params.tree ); - dump('list.length = ' + list.length + '\n'); + mw.sdump('D_CAT','list.length = ' + list.length + '\n'); var filtered_list = filter_list( list, function (obj) { return (obj.getAttribute('object_type') == 'copy'); } ); - dump('filtered_list.length = ' + filtered_list.length + '\n'); + mw.sdump('D_CAT','filtered_list.length = ' + filtered_list.length + '\n'); var id_mapped_list = map_list( filtered_list, function (obj) { return obj.getAttribute('copy_id'); } ); - dump('id_mapped_list.length = ' + id_mapped_list.length + '\n'); + mw.sdump('D_CAT','id_mapped_list.length = ' + id_mapped_list.length + '\n'); var result = user_request( 'open-ils.search', 'open-ils.search.asset.copy.fleshed.batch.retrieve', [ id_mapped_list ] )[0]; - dump('result.length = ' + result.length + '\n'); + mw.sdump('D_CAT','result.length = ' + result.length + '\n'); cn_list = new Array(); for (var i in result) { cn_list[i] = new acn(); @@ -33,12 +33,12 @@ function copy_edit_init() { cn_list[i].owning_lib( filtered_list[i].getAttribute('ou_id') ); cn_list[i].copies( [ result[i] ] ); } - dump('cn_list = ' + js2JSON(cn_list) + '\n'); - spawn_copy_editor(); + mw.sdump('D_CAT','cn_list = ' + js2JSON(cn_list) + '\n'); + spawn_legacy_copy_editor(); } -function spawn_copy_editor() { - dump('trying to spawn_copy_editor()\n'); +function spawn_legacy_copy_editor() { + mw.sdump('D_CAT','trying to spawn_copy_editor()\n'); var params = { 'select_all' : false }; var chrome = 'chrome://evergreen/content/cat/copy.xul'; var frame = document.getElementById('copy_edit_frame'); @@ -47,13 +47,13 @@ function spawn_copy_editor() { frame.contentWindow.cn_list = cn_list; frame.contentWindow.mw = mw; frame.contentWindow.real_parentWindow = this; - frame.contentWindow.parentWindow = parentWindow; + frame.contentWindow.parentWindow = window.app_shell; frame.contentWindow.params = params; } function save_edited_copies() { - //dump('trying to save ====================================================================================\n\n\n'); - //dump('cn_list = ' + js2JSON(cn_list) + '\n\n'); + //mw.sdump('D_CAT','trying to save ====================================================================================\n\n\n'); + //mw.sdump('D_CAT','cn_list = ' + js2JSON(cn_list) + '\n\n'); var copies = []; for (var i = 0; i < cn_list.length; i++) { var cn_copies = cn_list[i].copies(); @@ -61,7 +61,7 @@ function save_edited_copies() { copies.push( cn_copies[j] ); } } - //dump('copies = ' + js2JSON(copies) + '\n\n'); + //mw.sdump('D_CAT','copies = ' + js2JSON(copies) + '\n\n'); try { var result = user_request( 'open-ils.cat', @@ -73,7 +73,7 @@ function save_edited_copies() { } else { throw('There was an error updating the copies.\n'); } - dump('Result = ' + js2JSON(result) + '\n'); + mw.sdump('D_CAT','Result = ' + js2JSON(result) + '\n'); refresh_spawning_browse_list(); } catch(E) { handle_error(E); @@ -84,6 +84,6 @@ function refresh_spawning_browse_list() { try { params.refresh_func(); } catch(E) { - dump('refresh_spawning_browse_list error: ' + js2JSON(E) + '\n'); + mw.sdump('D_CAT','refresh_spawning_browse_list error: ' + js2JSON(E) + '\n'); } } diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.xul index 268721c32c..b6271c2924 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.xul @@ -16,14 +16,12 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + + - diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/marc.js b/Evergreen/staff_client/chrome/content/evergreen/cat/marc.js index 4e6da64a30..23cd7844f3 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/marc.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/marc.js @@ -1,4 +1,4 @@ -dump('loading marc.js\n'); +mw.sdump('D_CAT','loading marc.js\n'); var character_measure = {}; var tree; @@ -6,10 +6,10 @@ var meta; var backup_tree; function my_init() { - dump('Entering my_init() : ' + timer_elapsed('cat') + '\n'); - dump('TESTING: marc.js: ' + mw.G['main_test_variable'] + '\n'); + mw.sdump('D_CAT','Entering my_init() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','TESTING: marc.js: ' + mw.G['main_test_variable'] + '\n'); - dump("DOC ID " + find_this_id + "\n" ); + mw.sdump('D_CAT',"DOC ID " + find_this_id + "\n" ); if (! params.import_tree ) { tree = retrieve_record( find_this_id ); @@ -29,12 +29,14 @@ function my_init() { document.getElementById('meta_tcn_publisher').setAttribute('value', meta.tcn_value() ); - var text = document.createTextNode( - record_columns[1] + ' / ' + record_columns[2] - ); - document.getElementById('meta_title_author').appendChild( - text - ); + if (params.record_columns) { + var text = document.createTextNode( + params.record_columns[1] + ' / ' + params.record_columns[2] + ); + document.getElementById('meta_title_author').appendChild( + text + ); + } } else { tree = params.import_tree; if (tree.name() == 'collection') { @@ -46,8 +48,8 @@ function my_init() { ); } } - //dump('Retrieved: ' + js2JSON(tree) + '\n'); - //dump('Retrieved: ' + js2JSON(meta) + '\n'); + //mw.sdump('D_CAT','Retrieved: ' + js2JSON(tree) + '\n'); + //mw.sdump('D_CAT','Retrieved: ' + js2JSON(meta) + '\n'); build_grid( document.getElementById('ctrl_rows'), document.getElementById('data_rows'), @@ -59,7 +61,7 @@ function my_init() { window.addEventListener('resize',my_resize_handler,false); handle_tag_change(); document.getElementById('data_rows').firstChild.firstChild.firstChild.focus(); - dump('Exiting my_init() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting my_init() : ' + timer_elapsed('cat') + '\n'); } function measure_character(w,c) { @@ -78,13 +80,13 @@ function measure_character(w,c) { } function my_resize_handler(ev) { - dump('resize\n'); + mw.sdump('D_CAT','resize\n'); resizeAllWrappers('ctrl_rows'); resizeAllWrappers('data_rows'); } function retrieve_record(id) { - dump('Entering retrieve_record() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Entering retrieve_record() : ' + timer_elapsed('cat') + '\n'); var result = user_request( 'open-ils.cat', 'open-ils.cat.biblio.record.tree.retrieve', @@ -98,21 +100,21 @@ function retrieve_record(id) { );*/ if (typeof(result[0]) != 'object') { alert( 'user_request gave ' + js2JSON(result) ); - dump('Exiting retrieve_record() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting retrieve_record() : ' + timer_elapsed('cat') + '\n'); return 0; } else { /* - dump('Entering nodeset2tree() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Entering nodeset2tree() : ' + timer_elapsed('cat') + '\n'); result[0] = nodeset2tree( result[0] )[0]; - dump('Exiting nodeset2tree() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting nodeset2tree() : ' + timer_elapsed('cat') + '\n'); */ - dump('Exiting retrieve_record() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting retrieve_record() : ' + timer_elapsed('cat') + '\n'); return result[0]; } } function retrieve_meta_record(id) { - dump('Entering retrieve_meta_record() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Entering retrieve_meta_record() : ' + timer_elapsed('cat') + '\n'); var result = user_request( 'open-ils.cat', 'open-ils.cat.biblio.record.metadata.retrieve', @@ -120,10 +122,10 @@ function retrieve_meta_record(id) { ); if (typeof(result[0]) != 'object') { alert( 'user_request gave ' + js2JSON(result) ); - dump('Exiting retrieve_meta_record() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting retrieve_meta_record() : ' + timer_elapsed('cat') + '\n'); return 0; } else { - dump('Exiting retrieve_meta_record() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting retrieve_meta_record() : ' + timer_elapsed('cat') + '\n'); return result[0][0]; } } @@ -132,7 +134,7 @@ function retrieve_meta_record(id) { function empty_me(p) { while (p.lastChild) { - //dump('emptying ' + p.lastChild.tagName + '\n'); + //mw.sdump('D_CAT','emptying ' + p.lastChild.tagName + '\n'); empty_me(p.lastChild); p.removeChild(p.lastChild); } @@ -146,10 +148,10 @@ function empty_grid( ctrl_rows, data_rows ) { } function build_grid( ctrl_rows, data_rows, root ) { - dump('Entering build_grid() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Entering build_grid() : ' + timer_elapsed('cat') + '\n'); var ctrl_count = 1; var data_count = 1; - //dump( 'what is root?\n' + pretty_print(js2JSON(root)) + '\n'); - dump('root.children.length = ' + root.children.length + '\n'); + //mw.sdump('D_CAT', 'what is root?\n' + pretty_print(js2JSON(root)) + '\n'); + mw.sdump('D_CAT','root.children.length = ' + root.children.length + '\n'); root_loop: var children = root.children(); for (var i in children) { @@ -177,19 +179,19 @@ function build_grid( ctrl_rows, data_rows, root ) { ); break; default: - dump('Unexpected row type: ' + + mw.sdump('D_CAT','Unexpected row type: ' + js2JSON(node) + '\n'); break; } break; default: /* eh? */ - dump( 'Did not expect node_type = ' + node_type + + mw.sdump('D_CAT', 'Did not expect node_type = ' + node_type + ' : ' + js2JSON(node) + '\n'); break; } - //dump( i + ' ' + dump_ns_node(node) + '\n'); + //mw.sdump('D_CAT', i + ' ' + dump_ns_node(node) + '\n'); } - dump('Exiting build_grid() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting build_grid() : ' + timer_elapsed('cat') + '\n'); } function get_row( top ) { @@ -204,7 +206,7 @@ function get_row( top ) { var id = top.intra_doc_id(); var children = top.children(); row.field.id = id; - dump('Making row.... row.field.id = <' + id + '>\n'); + mw.sdump('D_CAT','Making row.... row.field.id = <' + id + '>\n'); if (name == 'leader') { row.tag.value = 'LDR'; row.tag.id = id; } row.type = name; top_loop: @@ -233,7 +235,7 @@ function get_row( top ) { row.ind2.id = node_id; break; default: - dump('\tattribute surprise on node_name = ' + + mw.sdump('D_CAT','\tattribute surprise on node_name = ' + node_name + ' : ' + js2JSON(node) + '\n'); break; @@ -249,7 +251,7 @@ function get_row( top ) { row.data.id = node_id; break; default: - dump('\telement surprise on node_name = ' + + mw.sdump('D_CAT','\telement surprise on node_name = ' + node_name + ' : ' + js2JSON(node) + '\n'); break; @@ -260,13 +262,13 @@ function get_row( top ) { row.data.id = node_id; break; default: /* eh? */ - dump('\tunknown type surprise on node_type = ' + + mw.sdump('D_CAT','\tunknown type surprise on node_type = ' + node_type + ' : ' + js2JSON(node) + '\n'); break; } } - //dump(js2JSON(row) + '\n'); + //mw.sdump('D_CAT',js2JSON(row) + '\n'); return row; } @@ -279,13 +281,13 @@ function build_xul_row( id, type ) { return build_data_row( id ); break; default: - dump('Unexpected row type\n'); + mw.sdump('D_CAT','Unexpected row type\n'); break; } } function build_data_row( id ) { - //dump('Entering build_xul_row() : ' + timer_elapsed('cat') + '\n'); + //mw.sdump('D_CAT','Entering build_xul_row() : ' + timer_elapsed('cat') + '\n'); var xul_row = document.createElement('row'); xul_row.setAttribute('id',id); xul_row.setAttribute('class','field_row data_row'); @@ -336,11 +338,11 @@ function build_data_row( id ) { xul_row.appendChild(wrapper4); return xul_row; - //dump('Exiting build_xul_row() : ' + timer_elapsed('cat') + '\n'); + //mw.sdump('D_CAT','Exiting build_xul_row() : ' + timer_elapsed('cat') + '\n'); } function build_ctrl_row( id ) { - //dump('Entering build_xul_row() : ' + timer_elapsed('cat') + '\n'); + //mw.sdump('D_CAT','Entering build_xul_row() : ' + timer_elapsed('cat') + '\n'); var xul_row = document.createElement('row'); xul_row.setAttribute('class','field_row ctrl_row'); xul_row.setAttribute('id',id); @@ -372,7 +374,7 @@ function build_ctrl_row( id ) { xul_row.appendChild(wrapper4); return xul_row; - //dump('Exiting build_xul_row() : ' + timer_elapsed('cat') + '\n'); + //mw.sdump('D_CAT','Exiting build_xul_row() : ' + timer_elapsed('cat') + '\n'); } @@ -444,7 +446,7 @@ function populate_xul_row( xul_rows, row, id ) { } function handle_change(ev) { - dump('handle_change\n'); + mw.sdump('D_CAT','handle_change\n'); var t = ev.target; // parse subfields resizeWrapper(t); @@ -465,12 +467,12 @@ function resizeWrapper(t) { if (xrows < 1) { xrows = 1; } var xheight = (xrows * (lheight+5)); - //dump(wrapper.parentNode.id + ' wrapper: ' + width + 'x' + height + ' label: ' + lwidth + 'x' + lheight + '\n'); + //mw.sdump('D_CAT',wrapper.parentNode.id + ' wrapper: ' + width + 'x' + height + ' label: ' + lwidth + 'x' + lheight + '\n'); wrapper.setAttribute('style','min-height: ' + xheight + 'px;'); } function resizeAllWrappers(rows) { - dump('Entering resizeAllWrappers() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Entering resizeAllWrappers() : ' + timer_elapsed('cat') + '\n'); var p = document.getElementById(rows); var c = p.childNodes; for (var r in c) { @@ -482,7 +484,7 @@ function resizeAllWrappers(rows) { } } } - dump('Exiting resizeAllWrappers() : ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting resizeAllWrappers() : ' + timer_elapsed('cat') + '\n'); } function find_element_with_id(ns_slice,id) { @@ -490,22 +492,22 @@ function find_element_with_id(ns_slice,id) { // { node id => [lvl 1 index, lvl 2 index, lvl 3 index] } // with the hash being populated when the tree is generated // and updated when we go to insert nodes - //dump('Find ' + id + ' in ' + js2JSON(ns_slice) + '\n'); - //dump('Find ' + id + '\n'); + //mw.sdump('D_CAT','Find ' + id + ' in ' + js2JSON(ns_slice) + '\n'); + //mw.sdump('D_CAT','Find ' + id + '\n'); for (i in ns_slice) { if (ns_slice[i].intra_doc_id() == id) { - //dump('Found at index ' + i + '\n'); + //mw.sdump('D_CAT','Found at index ' + i + '\n'); return i; } } - dump(id + 'not found in' + js2JSON(ns_slice) + '\n'); + mw.sdump('D_CAT',id + 'not found in' + js2JSON(ns_slice) + '\n'); } function delete_children(branch) { var children = branch.children(); for (var c in children) { children[c].isdeleted(1); - dump( children[c].name() + ':' + + mw.sdump('D_CAT', children[c].name() + ':' + children[c].id() + ':' + children[c].intra_doc_id() + '.is_deleted = 1\n'); if (children[c].children()) { @@ -518,33 +520,33 @@ function submit_marc() { // walk through the marc grid and compare with the tree // 1) updates and deletes -dump('Updates and Deletes\n'); +mw.sdump('D_CAT','Updates and Deletes\n'); backup_tree = JSON2js( js2JSON( tree ) ); var tree_fields = tree.children(); // LEVEL 1 var ctrl_rows = document.getElementById('ctrl_rows').childNodes; for (var r = 0; r < ctrl_rows.length ; r++) { //if (r == 0) { continue; } // skip leader for now - //dump( r + '\n'); + //mw.sdump('D_CAT', r + '\n'); var tag_node_id; try { tag_node_id = ctrl_rows[r].getAttribute('mynode'); } catch(E) { - dump('Could not find mynode in ctrl_rows[' + r + ']\n'); + mw.sdump('D_CAT','Could not find mynode in ctrl_rows[' + r + ']\n'); continue; } - //dump( r + ':' + ctrl_rows[r].tagName + ':' + tag_node_id + '\n' ); + //mw.sdump('D_CAT', r + ':' + ctrl_rows[r].tagName + ':' + tag_node_id + '\n' ); if (tag_node_id) { -dump('Processing ctrl_rows[' + r + '], tag_node_id = ' + tag_node_id + '\n'); +mw.sdump('D_CAT','Processing ctrl_rows[' + r + '], tag_node_id = ' + tag_node_id + '\n'); if (tag_node_id < 0) { continue; } // new node, handle elsewhere -dump('1st find =========================================\n') +mw.sdump('D_CAT','1st find =========================================\n') var tree_pos = find_element_with_id(tree_fields,tag_node_id); if (tree_pos == null) { alert('tree_pos problem!'); } var tree_field = tree_fields[tree_pos]; if (ctrl_rows[r].getAttribute('hidden') == 'true') { tree_field.isdeleted(1); - dump( tree_field.name() + ':' + + mw.sdump('D_CAT', tree_field.name() + ':' + tree_field.id() + ':' + tree_field.intra_doc_id() + '.isdeleted = 1\n'); delete_children(tree_field); @@ -555,14 +557,14 @@ dump('1st find =========================================\n') var col2 = ctrl_rows[r].childNodes[1].firstChild; var id1 = col1.getAttribute('mynode'); var id2 = col2.getAttribute('mynode'); - dump('id1 = ' + id1 + ' col1.value = ' + col1.value + ' id2 = ' + id2 + ' col2.value = ' + col2.value + '\n'); + mw.sdump('D_CAT','id1 = ' + id1 + ' col1.value = ' + col1.value + ' id2 = ' + id2 + ' col2.value = ' + col2.value + '\n'); var tree_field_children = tree_field.children(); // LEVEL 2 if (r == 0) { // leader is special. Only one child if (tree_field_children[0].value() != col2.value) { tree_field_children[0].value(col2.value); tree_field_children[0].ischanged(1); - dump( tree_field_children[0].name() + ':' + + mw.sdump('D_CAT', tree_field_children[0].name() + ':' + tree_field_children[0].id() + ':' + tree_field_children[0].intra_doc_id() + '.ischanged = 1\n'); @@ -570,16 +572,16 @@ dump('1st find =========================================\n') continue; } -dump('2nd find =========================================\n') +mw.sdump('D_CAT','2nd find =========================================\n') var tree_tag = find_element_with_id(tree_field_children,id1); -dump('3rd find =========================================\n') +mw.sdump('D_CAT','3rd find =========================================\n') var tree_value = find_element_with_id(tree_field_children,id2); if (tree_tag == null) { alert('tree_tag problem!'); } if (tree_value == null) { alert('tree_value problem!'); } if (tree_field_children[tree_tag].value() != col1.value) { tree_field_children[tree_tag].value(col1.value); tree_field_children[tree_tag].ischanged(1); - dump( tree_field_children[tree_tag].name() + ':' + + mw.sdump('D_CAT', tree_field_children[tree_tag].name() + ':' + tree_field_children[tree_tag].id() + ':' + tree_field_children[tree_tag].intra_doc_id() + '.ischanged = 1\n'); @@ -587,7 +589,7 @@ dump('3rd find =========================================\n') if (tree_field_children[tree_value].value() != col2.value) { tree_field_children[tree_value].value(col2.value); tree_field_children[tree_value].ischanged(1); - dump( tree_field_children[tree_value].name() + ':' + + mw.sdump('D_CAT', tree_field_children[tree_value].name() + ':' + tree_field_children[tree_value].id() + ':' + tree_field_children[tree_value].intra_doc_id() + '.ischanged = 1\n'); @@ -602,18 +604,18 @@ dump('3rd find =========================================\n') } catch(E) { continue; } - //dump( r + ':' + data_rows[r].tagName + ':' + tag_node_id + '\n' ); + //mw.sdump('D_CAT', r + ':' + data_rows[r].tagName + ':' + tag_node_id + '\n' ); if (tag_node_id) { -dump('Processing data_rows[' + r + '], tag_node_id = ' + tag_node_id + '\n'); +mw.sdump('D_CAT','Processing data_rows[' + r + '], tag_node_id = ' + tag_node_id + '\n'); if (tag_node_id < 0) { continue; } // new node, handle elsewhere -dump('4th find =========================================\n') +mw.sdump('D_CAT','4th find =========================================\n') var tree_pos = find_element_with_id(tree_fields,tag_node_id); if (tree_pos == null) { alert('tree_pos problem!'); } var tree_field = tree_fields[tree_pos]; if (data_rows[r].getAttribute('hidden') == 'true') { tree_field.isdeleted(1); - dump(tree_field.name() + ':' + + mw.sdump('D_CAT',tree_field.name() + ':' + tree_field.id() + ':' + tree_field.intra_doc_id() + '.isdeleted = 1\n'); @@ -630,13 +632,13 @@ dump('4th find =========================================\n') var id3 = col3.getAttribute('mynode'); var id4 = col4.getAttribute('mynode'); var tree_field_children = tree_field.children(); // LEVEL 2 -dump('5th find =========================================\n') +mw.sdump('D_CAT','5th find =========================================\n') var tree_tag = find_element_with_id(tree_field_children,id1); -dump('6th find =========================================\n') +mw.sdump('D_CAT','6th find =========================================\n') var tree_ind1 = find_element_with_id(tree_field_children,id2); -dump('7th find =========================================\n') +mw.sdump('D_CAT','7th find =========================================\n') var tree_ind2 = find_element_with_id(tree_field_children,id3); -dump('8th find =========================================\n') +mw.sdump('D_CAT','8th find =========================================\n') var tree_data = find_element_with_id(tree_field_children,id4); if (tree_tag == null) { alert('tree_tag problem!'); } if (tree_ind1 == null) { alert('tree_ind1 problem!'); } @@ -645,7 +647,7 @@ dump('8th find =========================================\n') if (tree_field_children[tree_tag].value() != col1.value) { tree_field_children[tree_tag].value(col1.value); tree_field_children[tree_tag].ischanged(1); - dump( tree_field_children[tree_tag].name() + ':' + + mw.sdump('D_CAT', tree_field_children[tree_tag].name() + ':' + tree_field_children[tree_tag].id() + ':' + tree_field_children[tree_tag].intra_doc_id() + '.is_changed = 1\n'); @@ -653,7 +655,7 @@ dump('8th find =========================================\n') if (tree_field_children[tree_ind1].value() != col2.value) { tree_field_children[tree_ind1].value(col2.value); tree_field_children[tree_ind1].ischanged(1); - dump( tree_field_children[tree_ind1].name() + ':' + + mw.sdump('D_CAT', tree_field_children[tree_ind1].name() + ':' + tree_field_children[tree_ind1].id() + ':' + tree_field_children[tree_ind1].intra_doc_id() + '.is_changed = 1\n'); @@ -661,7 +663,7 @@ dump('8th find =========================================\n') if (tree_field_children[tree_ind2].value() != col3.value) { tree_field_children[tree_ind2].value(col3.value); tree_field_children[tree_ind2].ischanged(1); - dump( tree_field_children[tree_ind2].name() + ':' + + mw.sdump('D_CAT', tree_field_children[tree_ind2].name() + ':' + tree_field_children[tree_ind2].id() + ':' + tree_field_children[tree_ind2].intra_doc_id() + '.is_changed = 1\n'); @@ -672,7 +674,7 @@ dump('8th find =========================================\n') // 2) inserts -dump('Inserts\n'); +mw.sdump('D_CAT','Inserts\n'); for (var r = 0; r < ctrl_rows.length ; r++) { var newnode; @@ -682,7 +684,7 @@ dump('Inserts\n'); continue; } if (newnode=='true') { -dump('New node = ctrl_rows[' + r + ']'); +mw.sdump('D_CAT','New node = ctrl_rows[' + r + ']'); if (ctrl_rows[r].getAttribute('hidden')=='true') { continue; } var col1 = ctrl_rows[r].childNodes[0].firstChild.value; var col2 = ctrl_rows[r].childNodes[1].firstChild.value; @@ -696,7 +698,7 @@ dump('New node = ctrl_rows[' + r + ']'); level2b.value(col2); level1.children([ level2a, level2b ]); ctrl_rows[r].setAttribute('mynode', level1.intra_doc_id()); -dump(' with intra_doc_id = ' + level1.intra_doc_id() + '\n'); +mw.sdump('D_CAT',' with intra_doc_id = ' + level1.intra_doc_id() + '\n'); insert_into_tree(tree.children(),ctrl_rows[r],level1); } } @@ -709,7 +711,7 @@ dump(' with intra_doc_id = ' + level1.intra_doc_id() + '\n'); continue; } if (newnode=='true') { -dump('New node = data_rows[' + r + ']'); +mw.sdump('D_CAT','New node = data_rows[' + r + ']'); if (data_rows[r].getAttribute('hidden')=='true') { continue; } var col1 = data_rows[r].childNodes[0].firstChild.value; var col2 = data_rows[r].childNodes[1].firstChild.value; @@ -729,13 +731,13 @@ dump('New node = data_rows[' + r + ']'); level1.children([ level2a, level2b, level2c ]); process_subfields(level1.children(),col4); data_rows[r].setAttribute('mynode', level1.intra_doc_id()); -dump(' with intra_doc_id = ' + level1.intra_doc_id() + '\n'); +mw.sdump('D_CAT',' with intra_doc_id = ' + level1.intra_doc_id() + '\n'); insert_into_tree(tree.children(),data_rows[r],level1); } } - //dump('******\nSending: ' + pretty_print(js2JSON(tree)) + '\n'); - dump('Auth session: ' + mw.G['auth_ses'][0] + '\n'); + //mw.sdump('D_CAT','******\nSending: ' + pretty_print(js2JSON(tree)) + '\n'); + mw.sdump('D_CAT','Auth session: ' + mw.G['auth_ses'][0] + '\n'); try { if (params.import_tree) { tree = user_request( @@ -752,7 +754,7 @@ dump(' with intra_doc_id = ' + level1.intra_doc_id() + '\n'); )[0]; } if (typeof(tree) == 'object') { - dump('\n\n\n\nnew tree = ' + js2JSON(tree) + '\n'); + mw.sdump('D_CAT','\n\n\n\nnew tree = ' + js2JSON(tree) + '\n'); params.import_tree = false; new_node_id = -1; empty_grid('ctrl_rows','data_rows'); @@ -768,7 +770,7 @@ dump(' with intra_doc_id = ' + level1.intra_doc_id() + '\n'); throw('result: ' + tree + '\n'); } } catch(E) { - dump('backup_tree\n'); + mw.sdump('D_CAT','backup_tree\n'); tree = backup_tree; handle_tag_change(); my_resize_handler(); @@ -779,9 +781,9 @@ dump(' with intra_doc_id = ' + level1.intra_doc_id() + '\n'); function insert_into_tree(branch,r,n) { var s = nextSibling_not_hidden(r); if (s) { - dump('9th find =========================================\n') - dump('s = ' + s + '\n'); - dump('s.getAttribute mynode = <' + s.getAttribute('mynode') + '>\n'); + mw.sdump('D_CAT','9th find =========================================\n') + mw.sdump('D_CAT','s = ' + s + '\n'); + mw.sdump('D_CAT','s.getAttribute mynode = <' + s.getAttribute('mynode') + '>\n'); var pos = find_element_with_id(branch,s.getAttribute('mynode')); branch.splice(pos,0,n); } else { @@ -795,15 +797,15 @@ function populate_node(node,ntype,name) { node.isnew( 1 ); node.node_type( ntype ); node.name( name ); - dump( node.name() + ':' + node.intra_doc_id() + '.is_new = 1\n'); + mw.sdump('D_CAT', node.name() + ':' + node.intra_doc_id() + '.is_new = 1\n'); } function process_subfields(tfc,datastring) { - dump('process_subfields: <' + tfc + '> <' + datastring + '>\n'); + mw.sdump('D_CAT','process_subfields: <' + tfc + '> <' + datastring + '>\n'); var orig_subfields = []; - //dump('\n'); + //mw.sdump('D_CAT','\n'); for (var i in tfc) { - dump(i + ' : ' + typeof(tfc[i]) + ' : ' + js2JSON(tfc[i]) + ' : node_type() = ' + tfc[i].node_type() + '\n'); + mw.sdump('D_CAT',i + ' : ' + typeof(tfc[i]) + ' : ' + js2JSON(tfc[i]) + ' : node_type() = ' + tfc[i].node_type() + '\n'); try { if (tfc[i].node_type() == 1) { var orig_data = tfc[i].children()[1].value(); @@ -816,7 +818,7 @@ function process_subfields(tfc,datastring) { } } catch(E) { - dump('\tan error? gasp: ' + js2JSON(E) + '\n'); + mw.sdump('D_CAT','\tan error? gasp: ' + js2JSON(E) + '\n'); continue; } } @@ -826,15 +828,15 @@ function process_subfields(tfc,datastring) { // a data string start with the subfield delimiter symbol. We're // passing the buck of the 'implicit' subfield-a check elsewhere. local_subf_array.shift(); - dump('orig_subfields = ' + js2JSON(orig_subfields) + '\n'); - dump('local_subfields = ' + js2JSON(local_subf_array) + '\n'); + mw.sdump('D_CAT','orig_subfields = ' + js2JSON(orig_subfields) + '\n'); + mw.sdump('D_CAT','local_subfields = ' + js2JSON(local_subf_array) + '\n'); for (var i in local_subf_array) { if ((local_subf_array[i]=='')||(local_subf_array==null)) { continue; } var s_ind = local_subf_array[i].substr(0,1); var s_data = local_subf_array[i].substr(1).replace(/^\s+/,'').replace(/\s+$/,''); - dump('Processing code = ' + s_ind + ' and value = ' + s_data + '\n'); + mw.sdump('D_CAT','Processing code = ' + s_ind + ' and value = ' + s_data + '\n'); if (!orig_subfields[i]) { // new subfield - dump('making new subfield : i = ' + i + '\n'); + mw.sdump('D_CAT','making new subfield : i = ' + i + '\n'); var level1 = new brn(); populate_node( level1, 1, 'subfield' ); var level2a = new brn(); @@ -845,7 +847,7 @@ function process_subfields(tfc,datastring) { level2b.value(s_data); level1.children([ level2a, level2b ]); tfc.push(level1); - dump('New node = ' + js2JSON(level1) + '\n'); + mw.sdump('D_CAT','New node = ' + js2JSON(level1) + '\n'); } else { var orig_node = orig_subfields[i][0]; var orig_ind = orig_subfields[i][1]; @@ -853,20 +855,20 @@ function process_subfields(tfc,datastring) { if (orig_ind != s_ind) { // update subf indicator tfc[orig_node].children()[0].value(s_ind); tfc[orig_node].children()[0].ischanged(1); - dump( tfc[orig_node].children()[0].name() + ':' + + mw.sdump('D_CAT', tfc[orig_node].children()[0].name() + ':' + tfc[orig_node].children()[0].id() + ':' + tfc[orig_node].children()[0].intra_doc_id() + '.is_changed = 1\n'); - dump('Updated node = ' + js2JSON(tfc[orig_node].children()[0]) + '\n'); + mw.sdump('D_CAT','Updated node = ' + js2JSON(tfc[orig_node].children()[0]) + '\n'); } if (orig_data != s_data) { // update subf data tfc[orig_node].children()[1].value(s_data); tfc[orig_node].children()[1].ischanged(1); - dump( tfc[orig_node].children()[1].name() + ':' + + mw.sdump('D_CAT', tfc[orig_node].children()[1].name() + ':' + tfc[orig_node].children()[1].id() + ':' + tfc[orig_node].children()[1].intra_doc_id() + '.is_changed = 1\n'); - dump('Updated node = ' + js2JSON(tfc[orig_node].children()[1]) + '\n'); + mw.sdump('D_CAT','Updated node = ' + js2JSON(tfc[orig_node].children()[1]) + '\n'); } } } @@ -874,7 +876,7 @@ function process_subfields(tfc,datastring) { for (var i = local_subf_array.length; i < orig_subfields.length; i++) { var orig_node = orig_subfields[i][0]; tfc[orig_node].isdeleted(1); - dump( tfc[orig_node].name() + ':' + + mw.sdump('D_CAT', tfc[orig_node].name() + ':' + tfc[orig_node].id() + ':' + tfc[orig_node].intra_doc_id() + '.is_deleted = 1\n'); delete_children(tfc[orig_node]); diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/marc.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/marc.xul index c618d57631..3fded65e8e 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/marc.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/marc.xul @@ -15,21 +15,17 @@ orient="vertical" style="overflow: scroll" width="800" height="600" persist="width height" onload=" - dump('start onload: ' + timer_elapsed('cat') + '\n'); my_init(); - dump('end onload: ' + timer_elapsed('cat') + '\n'); " xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + + - diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/marc_fixed.js b/Evergreen/staff_client/chrome/content/evergreen/cat/marc_fixed.js index 9ec8342dcc..220710e5e5 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/marc_fixed.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/marc_fixed.js @@ -14,15 +14,15 @@ function pad_fixed(value,field) { function handle_fixed_change(ev) { - dump('Entering handle_fixed_change\n'); - if (ev.target.tagName != 'textbox') { dump('early exit\n'); return; } + mw.sdump('D_CAT','Entering handle_fixed_change\n'); + if (ev.target.tagName != 'textbox') { mw.sdump('D_CAT','early exit\n'); return; } var t = ev.target; var field = t.getAttribute('field'); var spos = t.getAttribute('spos'); var epos = t.getAttribute('epos'); var size = t.getAttribute('size'); if ( (epos - spos + 1) != size ) { - dump('Invalid fixed field DTD: field='+field+' spos='+spos+ + mw.sdump('D_CAT','Invalid fixed field DTD: field='+field+' spos='+spos+ ' epos='+epos+' size='+size+'\n'); alert('Invalid fixed field DTD: field='+field+' spos='+spos+ ' epos='+epos+' size='+size+'\n'); @@ -37,14 +37,14 @@ function handle_fixed_change(ev) { t.value = t.value + padding; } var fixed = find_textbox('ctrl_rows', field); - //dump('length of fixed: ' + fixed.value.length + '\n'); + //mw.sdump('D_CAT','length of fixed: ' + fixed.value.length + '\n'); fixed.value = fixed.value + pad_fixed(fixed.value,field); - dump('length of fixed: ' + fixed.value.length + '\n'); + mw.sdump('D_CAT','length of fixed: ' + fixed.value.length + '\n'); - //dump('field='+field+' spos='+spos+' epos='+epos+' size='+size+' t="'+t.value+'"\n'); - dump('replacing "'+fixed.value+'"\n'); + //mw.sdump('D_CAT','field='+field+' spos='+spos+' epos='+epos+' size='+size+' t="'+t.value+'"\n'); + mw.sdump('D_CAT','replacing "'+fixed.value+'"\n'); fixed.value = fixed.value.substr(0,spos) + t.value + fixed.value.substr(1+Number(epos)); - dump(' with "'+fixed.value+'"\n'); + mw.sdump('D_CAT',' with "'+fixed.value+'"\n'); } function find_textbox(where, field) { @@ -52,7 +52,7 @@ function find_textbox(where, field) { var ideal_sibling; for (var r in rows) { if (typeof(rows[r])=='object') { - //dump(r + ':' + rows[r] + '\n'); + //mw.sdump('D_CAT',r + ':' + rows[r] + '\n'); var t = rows[r].childNodes[0].firstChild; if (t.value == field) { return rows[r].childNodes[1].firstChild; diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/marc_keys.js b/Evergreen/staff_client/chrome/content/evergreen/cat/marc_keys.js index a7026380ca..6deb8d6401 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/marc_keys.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/marc_keys.js @@ -1,11 +1,11 @@ function handle_keyup(ev) { if (ev.target.tagName != 'textbox') { return; } - //dump('keyCode:' + ev.keyCode + ' charCode:' + ev.charCode + ' shift:' + ev.shiftKey + ' ctrl:' + ev.ctrlKey + ' meta:' + ev.metaKey + '\n'); + //mw.sdump('D_CAT','keyCode:' + ev.keyCode + ' charCode:' + ev.charCode + ' shift:' + ev.shiftKey + ' ctrl:' + ev.ctrlKey + ' meta:' + ev.metaKey + '\n'); resizeWrapper(ev.target); } function handle_keypress(ev) { - dump('keyCode:' + ev.keyCode + ' charCode:' + ev.charCode + ' shift:' + ev.shiftKey + ' ctrl:' + ev.ctrlKey + ' meta:' + ev.metaKey + '\n'); + mw.sdump('D_CAT','keyCode:' + ev.keyCode + ' charCode:' + ev.charCode + ' shift:' + ev.shiftKey + ' ctrl:' + ev.ctrlKey + ' meta:' + ev.metaKey + '\n'); if (ev.target.tagName != 'textbox') { return; } var rstatus = false; if (ev.charCode) { @@ -74,7 +74,7 @@ function handle_key_c_del(ev) { handle_tag_change(ev); if (! navigate_row_down(t,which_col_am_i(t),false) ) { navigate_row_up(t,which_col_am_i(t),false); - dump("let's go up\n"); + mw.sdump('D_CAT',"let's go up\n"); } return true; } else { diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/marc_validate.js b/Evergreen/staff_client/chrome/content/evergreen/cat/marc_validate.js index f854b31fff..43e695cb3b 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/marc_validate.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/marc_validate.js @@ -44,7 +44,7 @@ function legend_marc() { } function handle_tag_change(ev) { - dump('Entering handle_tag_change: ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Entering handle_tag_change: ' + timer_elapsed('cat') + '\n'); rule_warnings = []; disable_widgets('explain_marc'); tag_seen = {}; var rows = document.getElementById('ctrl_rows').childNodes; @@ -66,7 +66,7 @@ function handle_tag_change(ev) { } } if (rule_warnings.length > 0) { enable_widgets('explain_marc'); } - dump('Exiting handle_tag_change: ' + timer_elapsed('cat') + '\n'); + mw.sdump('D_CAT','Exiting handle_tag_change: ' + timer_elapsed('cat') + '\n'); } function test_tagnumber_rule(r) { @@ -88,12 +88,12 @@ function test_tagnumber_rule(r) { if ( (rule.repeat == 'NR') && (tag_seen[t.value] > 1) ) { add_css_class(t,'invalid'); var s = 'Tag ' + t.value + ' should be Non-Repeating\n'; - rule_warnings.push(s); dump(s); + rule_warnings.push(s); mw.sdump('D_CAT',s); } } else if (t.value != 'LDR') { add_css_class(t,'invalid'); var s = 'Tag ' + t.value + ' is unknown.\n'; - rule_warnings.push(s); dump(s); + rule_warnings.push(s); mw.sdump('D_CAT',s); } } @@ -107,7 +107,7 @@ function test_ind1_rule(r) { if (! ind1.value.match(eval(regex)) ) { add_css_class(ind1,'invalid'); var s = 'Tag ' + tagnumber + ' Indicator 1 should be one of these characters: "' + marc_rules[tagnumber].ind1.allowed + '"\n'; - rule_warnings.push(s); dump(s); + rule_warnings.push(s); mw.sdump('D_CAT',s); } } } @@ -122,7 +122,7 @@ function test_ind2_rule(r) { if (! ind2.value.match(eval(regex)) ) { add_css_class(ind2,'invalid'); var s = 'Tag ' + tagnumber + ' Indicator 2 should be one of these characters: "' + marc_rules[tagnumber].ind2.allowed + '"\n'; - rule_warnings.push(s); dump(s); + rule_warnings.push(s); mw.sdump('D_CAT',s); } } } @@ -140,7 +140,7 @@ function test_subfield_rule(r) { } else { add_css_class(data,'invalid'); var s = 'DEBUG: Need to add code to make an implicit subfield-a\n'; - rule_warnings.push(s); dump(s); + rule_warnings.push(s); mw.sdump('D_CAT',s); subf_array.shift(); } var subf_seen = {}; @@ -148,7 +148,7 @@ function test_subfield_rule(r) { if ((subf_array[i]=='')||(subf_array==null)) { add_css_class(data,'invalid'); var s = 'You have incomplete subfield delimiters.\n'; - rule_warnings.push(s); dump(s); + rule_warnings.push(s); mw.sdump('D_CAT',s); continue; } var s_ind = subf_array[i].substr(0,1); @@ -158,12 +158,12 @@ function test_subfield_rule(r) { if ( (rule.repeat == 'NR') && (subf_seen[s_ind]>1) ) { add_css_class(data,'invalid'); var s = 'Tag ' + tagnumber + ' subfield-' + s_ind + ' should be Non-Repeating\n'; - rule_warnings.push(s); dump(s); + rule_warnings.push(s); mw.sdump('D_CAT',s); } } else { add_css_class(data,'invalid'); var s = 'Tag ' + tagnumber + ' does not have a subfield-' + s_ind + '\n'; - rule_warnings.push(s); dump(s); + rule_warnings.push(s); mw.sdump('D_CAT',s); } } } diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/record_list.js b/Evergreen/staff_client/chrome/content/evergreen/cat/record_list.js index 033ff58b2d..faf8e6974a 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/record_list.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/record_list.js @@ -1,12 +1,12 @@ -dump('Parsing record_list.js\n'); +mw.sdump('D_CAT','Parsing record_list.js\n'); var test_hash = { 'a' : '123' } ; function my_init() { timer_init('cat'); - dump('TESTING: record_list.js: ' + mw.G['main_test_variable'] + '\n'); - dump('test_hash = ' + js2JSON(test_hash) + '\n'); - dump('search_term = ' + search_term + ' search_type = ' + search_type + ' search_order = ' + search_order + ' search_location = ' + search_location + '\n'); + mw.sdump('D_CAT','TESTING: record_list.js: ' + mw.G['main_test_variable'] + '\n'); + mw.sdump('D_CAT','test_hash = ' + js2JSON(test_hash) + '\n'); + mw.sdump('D_CAT','search_term = ' + search_term + ' search_type = ' + search_type + ' search_order = ' + search_order + ' search_location = ' + search_location + '\n'); var b = document.getElementById('count_copy_toggle'); b.setAttribute('label','Click to Show Records for All Libraries'); b.setAttribute('alt_label','Click to Show Only Records with Copies at ' + find_ou(mw.G['org_tree'],search_location).name()); @@ -45,7 +45,7 @@ function toggle_view(ev) { function search() { var result; - dump('search_type = ' + search_type + ' search_order = ' + search_order + ' search_term = ' + search_term + '\n'); + mw.sdump('D_CAT','search_type = ' + search_type + ' search_order = ' + search_order + ' search_term = ' + search_term + '\n'); switch(search_type) { case 'tcn': result = user_request( @@ -63,7 +63,7 @@ function search() { break; } // populate record_list with results - //dump( js2JSON( result ) + '\n'); + //mw.sdump('D_CAT', js2JSON( result ) + '\n'); var tc = document.getElementById('record_list_tree_children'); for (var i in result) { if (typeof(result[i])=='object') { @@ -85,7 +85,7 @@ function search() { item.appendChild( row ); tc.appendChild( item ); } else { - //dump('unexpected typeof(result['+i+']) = ' + typeof(result[i]) + ' : ' + result[i] + '\n'); + //mw.sdump('D_CAT','unexpected typeof(result['+i+']) = ' + typeof(result[i]) + ' : ' + result[i] + '\n'); } } } @@ -93,18 +93,18 @@ function search() { function make_treeitem(owner_doc) { var treeitem = document.createElement('treeitem'); treeitem.setAttribute('id',owner_doc); - //dump('treeitem = ' + treeitem + '\n'); + //mw.sdump('D_CAT','treeitem = ' + treeitem + '\n'); return treeitem; } function make_treerow() { var treerow = document.createElement('treerow'); - //dump('treerow = ' + treerow + '\n'); - //dump('arguments.length = ' + arguments.length + ' arguments = ' + js2JSON(arguments) + '\n'); + //mw.sdump('D_CAT','treerow = ' + treerow + '\n'); + //mw.sdump('D_CAT','arguments.length = ' + arguments.length + ' arguments = ' + js2JSON(arguments) + '\n'); for (var i = 0; i < arguments.length; i++) { - //dump(i + ' : ' + arguments[i] + '\n'); + //mw.sdump('D_CAT',i + ' : ' + arguments[i] + '\n'); var treecell = document.createElement('treecell'); - //dump('treecell = ' + treecell + '\n'); + //mw.sdump('D_CAT','treecell = ' + treecell + '\n'); var text = ''; if (typeof(arguments[i])=='object') { for (var j in arguments[i]) { @@ -128,7 +128,7 @@ function spawn_editors(tab) { hitlist.view.selection.getRangeAt(t,start,end); for (var v=start.value; v<=end.value; v++){ var i = hitlist.contentView.getItemAtIndex(v); - dump(i.tagName + '\n'); + mw.sdump('D_CAT',i.tagName + '\n'); var params = [ i.getAttribute('id'), i.firstChild.childNodes[0].getAttribute('label'), @@ -139,7 +139,14 @@ function spawn_editors(tab) { i.firstChild.childNodes[5].getAttribute('label'), i.firstChild.childNodes[6].getAttribute('label') ]; - spawn_marc_editor(tab,params); + var w = spawn_marc_editor( + window.app_shell,'new_tab','main_tabbox', { + 'find_this_id' : params[0], + 'record_columns' : params + } + ); + w.find_this_id = params[0]; + w.record_columns = params; } } } @@ -153,16 +160,23 @@ function spawn_browsers(tab) { hitlist.view.selection.getRangeAt(t,start,end); for (var v=start.value; v<=end.value; v++){ var i = hitlist.contentView.getItemAtIndex(v); - dump(i.tagName + '\n'); + mw.sdump('D_CAT',i.tagName + '\n'); var params = [ i.getAttribute('id') ]; - spawn_copy_browser(tab,params); + var w = spawn_copy_browser( + window.app_shell,'new_tab','main_tabbox', { + 'find_this_id' : params[0], + 'record_columns' : params + } + ); + w.find_this_id = params[0]; + w.record_columns = params; } } } /* function spawn_copy_browser(tab,params) { - dump('trying to spawn_marc_editor('+params[0]+')\n'); + mw.sdump('D_CAT','trying to spawn_marc_editor('+params[0]+')\n'); var w; var chrome = 'chrome://evergreen/content/cat/browse_list.xul'; if (tab) { @@ -177,7 +191,7 @@ function spawn_copy_browser(tab,params) { function spawn_marc_editor(tab,params) { - dump('trying to spawn_marc_editor('+params[0]+')\n'); + mw.sdump('D_CAT','trying to spawn_marc_editor('+params[0]+')\n'); var w; var chrome = 'chrome://evergreen/content/cat/marc.xul'; if (tab) { diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/record_list.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/record_list.xul index 5d420ac119..ca88d291fb 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/record_list.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/record_list.xul @@ -16,8 +16,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/volume.js b/Evergreen/staff_client/chrome/content/evergreen/cat/volume.js index 618f4965db..8b81822631 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/volume.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/volume.js @@ -2,19 +2,19 @@ var data = {}; var data_backup; var cn_list = []; var new_id = -1; function my_init() { - dump('entering my_init for volume.js\n'); - dump('TESTING: volume.js: ' + mw.G['main_test_variable'] + '\n'); - dump('record_id = ' + record_id + '\n'); - dump('tree_items: ' + tree_items + '\n'); + mw.sdump('D_CAT','entering my_init for volume.js\n'); + mw.sdump('D_CAT','TESTING: volume.js: ' + mw.G['main_test_variable'] + '\n'); + mw.sdump('D_CAT','record_id = ' + record_id + '\n'); + mw.sdump('D_CAT','tree_items: ' + tree_items + '\n'); if (params.shortcut == 'volume_add') { build_page_one(); } else if (params.shortcut == 'copy_add') { build_page_two(); } else { - dump('broken\n'); + mw.sdump('D_CAT','broken\n'); } listen_for_enter('volume_add'); - dump('exiting my_init for volume.js\n'); + mw.sdump('D_CAT','exiting my_init for volume.js\n'); } function listen_for_enter(w) { @@ -23,9 +23,9 @@ function listen_for_enter(w) { } w.addEventListener('keypress', function (ev) { - dump('wizard: ev.target.tagName = ' + ev.target.tagName + '\n'); - dump('\tev.keyCode = ' + ev.keyCode + '\n'); - dump('\tev.charCode = ' + ev.charCode + '\n'); + mw.sdump('D_CAT','wizard: ev.target.tagName = ' + ev.target.tagName + '\n'); + mw.sdump('D_CAT','\tev.keyCode = ' + ev.keyCode + '\n'); + mw.sdump('D_CAT','\tev.charCode = ' + ev.charCode + '\n'); if ((ev.target.tagName == 'textbox') && (ev.keyCode == 13)) { ev.preventDefault(); ev.stopPropagation(); // XBL bindings? bleh @@ -51,10 +51,10 @@ function page1_add_volume_row(ou) { } function page2_add_volume_row(ou,ti) { - dump('page2_add_volume_row...\n'); + mw.sdump('D_CAT','page2_add_volume_row...\n'); var desired_volumes = document.getElementById('p1_' + ou.id()).lastChild.value; - dump('ou = ' + ou.name() + ' desired = ' + desired_volumes + '\n'); + mw.sdump('D_CAT','ou = ' + ou.name() + ' desired = ' + desired_volumes + '\n'); if (desired_volumes > 0) { } else { return; } var rows = document.getElementById('page2_rows'); var row = document.createElement('row'); @@ -81,7 +81,7 @@ function page2_add_volume_row(ou,ti) { } function copy_add_page2_add_volume_row(ou,ti) { - dump('copy_add_page2_add_volume_row...\n'); + mw.sdump('D_CAT','copy_add_page2_add_volume_row...\n'); var rows = document.getElementById('page2_rows'); var row = document.getElementById('page2_row_cn_' + ou.id() ); if (!row) { @@ -146,7 +146,7 @@ function page3_add_volume_row(id,data) { } function page_four_add_volume_row(name,callnumber,barcode) { - dump('xul: name = ' + name + ' cn = ' + callnumber + ' bc = ' + barcode + '\n'); + mw.sdump('D_CAT','xul: name = ' + name + ' cn = ' + callnumber + ' bc = ' + barcode + '\n'); var listbox = document.getElementById('ephemeral_listbox'); var listitem = document.createElement('listitem'); listbox.appendChild(listitem); @@ -163,7 +163,7 @@ function page_four_add_volume_row(name,callnumber,barcode) { } function build_page_one() { - dump('build_page_one\n'); + mw.sdump('D_CAT','build_page_one\n'); for (var i in tree_items) { var ti = tree_items[i]; switch( ti.getAttribute('object_type') ) { @@ -182,10 +182,10 @@ function build_page_one() { } function build_page_two() { - dump('build_page_two\n'); + mw.sdump('D_CAT','build_page_two\n'); for (var i in tree_items) { var ti = tree_items[i]; - dump('Considering item with object_type = ' + ti.getAttribute('object_type') + '\n'); + mw.sdump('D_CAT','Considering item with object_type = ' + ti.getAttribute('object_type') + '\n'); switch( ti.getAttribute('object_type') ) { case 'org_unit' : var shortname = ti.getAttribute('id').split('_')[2]; @@ -208,11 +208,11 @@ function build_page_two() { } function build_page_three() { - dump('build_page_three\n'); + mw.sdump('D_CAT','build_page_three\n'); var rows = document.getElementById('page2_rows'); for (var i = 0; i < rows.childNodes.length; i++) { var row = rows.childNodes[i]; - dump(row + '\n'); + mw.sdump('D_CAT',row + '\n'); var ou_id = row.getAttribute('ou_id'); var ou_name = row.getAttribute('ou_name'); var volume_id = row.getAttribute('volume_id'); @@ -232,13 +232,13 @@ function build_page_three() { } } for (var i in data) { - dump('i: ' + i + ' data[i]: ' + js2JSON(data[i]) + '\n'); + mw.sdump('D_CAT','i: ' + i + ' data[i]: ' + js2JSON(data[i]) + '\n'); page3_add_volume_row( i, data[i]); } } function build_page_four() { - dump('build page four\n'); + mw.sdump('D_CAT','build page four\n'); document.getElementById('volume_add').canAdvance = false; var new_data = []; var rows = document.getElementById('page3_rows'); @@ -252,7 +252,7 @@ function build_page_four() { var volume_id = t.getAttribute('volume_id'); var barcode = t.value; //page_four_add_volume_row(ou_name,callnumber,barcode); - dump('t.tagName = ' + t.tagName + ' ou_id = ' + ou_id + ' cn = ' + callnumber + ' volume_id = ' + volume_id + ' bc = ' + barcode + '\n'); + mw.sdump('D_CAT','t.tagName = ' + t.tagName + ' ou_id = ' + ou_id + ' cn = ' + callnumber + ' volume_id = ' + volume_id + ' bc = ' + barcode + '\n'); if (! new_data[ou_id] ) { new_data[ou_id] = {}; } if (! new_data[ou_id][callnumber] ) { new_data[ou_id][callnumber] = []; @@ -296,9 +296,9 @@ function build_page_four() { cn_list.push(cn); } } - dump('Final data object: ' + js2JSON(cn_list) + '\n'); - dump('Final data object: ' + cn_list + '\n'); - spawn_copy_editor(); + mw.sdump('D_CAT','Final data object: ' + js2JSON(cn_list) + '\n'); + mw.sdump('D_CAT','Final data object: ' + cn_list + '\n'); + spawn_local_legacy_copy_editor(); } function send_to_bill() { @@ -307,7 +307,7 @@ function send_to_bill() { 'open-ils.cat.asset.volume_tree.fleshed.batch.update', [ mw.G['auth_ses'][0], cn_list] ); - dump('volume_tree.fleshed.batch.update result: ' + js2JSON(result) + '\n'); + mw.sdump('D_CAT','volume_tree.fleshed.batch.update result: ' + js2JSON(result) + '\n'); refresh_spawning_browse_list(); } @@ -315,12 +315,12 @@ function refresh_spawning_browse_list() { try { params.refresh_func(); } catch(E) { - dump('refresh_spawning_browse_list error: ' + js2JSON(E) + '\n'); + mw.sdump('D_CAT','refresh_spawning_browse_list error: ' + js2JSON(E) + '\n'); } } -function spawn_copy_editor(tab) { - dump('trying to spawn_copy_editor()\n'); +function spawn_local_legacy_copy_editor(tab) { + mw.sdump('D_CAT','trying to spawn_copy_editor()\n'); var params = { 'select_all' : true }; var chrome = 'chrome://evergreen/content/cat/copy.xul'; var frame = document.getElementById('page4_iframe'); @@ -329,7 +329,7 @@ function spawn_copy_editor(tab) { frame.contentWindow.cn_list = cn_list; frame.contentWindow.mw = mw; frame.contentWindow.real_parentWindow = this; - frame.contentWindow.parentWindow = parentWindow; + frame.contentWindow.parentWindow = window.app_shell; frame.contentWindow.params = params; } @@ -350,7 +350,7 @@ function check_volume_ou_perm(shortname) { // ***************************************************** Batch Volume Edit function volume_edit_init() { - dump('TESTING: volume.js: ' + mw.G['main_test_variable'] + '\n'); + mw.sdump('D_CAT','TESTING: volume.js: ' + mw.G['main_test_variable'] + '\n'); build_batch_edit_page1(); listen_for_enter('volume_edit'); } diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_overlay.xul index a64a6b040b..9c09a682e0 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_overlay.xul @@ -16,7 +16,7 @@ alert('Feature Not Yet Implemented'); "/> diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_wizard.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_wizard.xul index 7fce3fe735..26834d87d0 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_wizard.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_wizard.xul @@ -9,8 +9,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/volume_edit_wizard.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/volume_edit_wizard.xul index 148ef1276b..bc449fff44 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/volume_edit_wizard.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/volume_edit_wizard.xul @@ -9,8 +9,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + +