From c775f2e75b107d33792725b03b1173c1d0cbf537 Mon Sep 17 00:00:00 2001 From: Robert Soulliere Date: Wed, 17 Nov 2010 09:02:02 -0500 Subject: [PATCH] Fix PDF overflow issues in admin part. --- 1.6/admin/Upgrading-Evergreen_1.6.xml | 5 ++-- 1.6/admin/migratingdata.xml | 34 ++++++++++++++------------- 1.6/admin/staffclientinstallation.xml | 3 ++- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/1.6/admin/Upgrading-Evergreen_1.6.xml b/1.6/admin/Upgrading-Evergreen_1.6.xml index b6f6295b85..5c2bae1266 100644 --- a/1.6/admin/Upgrading-Evergreen_1.6.xml +++ b/1.6/admin/Upgrading-Evergreen_1.6.xml @@ -229,8 +229,9 @@ tar xzf Evergreen-ILS-1.6.1.2.tar.gz bootstrapping scripts and offline-config.pl for the offline staff client data uploader: cd /home/opensrf/Evergreen-ILS-1.6.1.2 -perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-offline --user evergreen \ ---password evergreen --hostname localhost --port 5432 --database evergreen +perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-offline \ +--user evergreen --password evergreen --hostname localhost --port 5432 \ +--database evergreen diff --git a/1.6/admin/migratingdata.xml b/1.6/admin/migratingdata.xml index ed47b7af58..074c753ddc 100644 --- a/1.6/admin/migratingdata.xml +++ b/1.6/admin/migratingdata.xml @@ -192,10 +192,11 @@ http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd"> sql CREATE TABLE students ( - student_id int, barcode text, last_name text, first_name text, program_number text, program_name text, - email text, address_type text, street1 text, street2 text, city text, province text, country text, - postal_code text, phone text, profile int, ident_type int, home_ou int, - claims_returned_count int DEFAULT 0, usrname text, net_access_level int DEFAULT 2, password text + student_id int, barcode text, last_name text, first_name text, program_number text, + program_name text, email text, address_type text, street1 text, street2 text, + city text, province text, country text, postal_code text, phone text, profile int, + ident_type int, home_ou int, claims_returned_count int DEFAULT 0, usrname text, + net_access_level int DEFAULT 2, password text ); Note the DEFAULT variables. These allow you to set default for your library or to populate required fields if you data allows @@ -214,10 +215,10 @@ substring(phone from 10), '(', ''), ')', ''), ' ', '-'); Insert records from the staging table into the actor.usr Evergreen table: INSERT INTO actor.usr ( - profile, usrname, email, passwd, ident_type, ident_value, first_given_name, family_name, day_phone, - home_ou, claims_returned_count, net_access_level) - SELECT profile, students.usrname, email, student_id, ident_type, student_id, first_name, last_name, - phone, home_ou, claims_returned_count, net_access_level + profile, usrname, email, passwd, ident_type, ident_value, first_given_name, + family_name, day_phone, home_ou, claims_returned_count, net_access_level) + SELECT profile, students.usrname, email, student_id, ident_type, student_id, + first_name, last_name, phone, home_ou, claims_returned_count, net_access_level FROM students; @@ -279,19 +280,20 @@ BEGIN; -- Create staging table. CREATE TABLE students ( - student_id int, barcode text, last_name text, first_name text, program_number text, program_name text, - email text, address_type text, street1 text, street2 text, city text, province text, country text, - postal_code text, phone text, profile int, ident_type int, home_ou int, - claims_returned_count int DEFAULT 0, usrname text, net_access_level int DEFAULT 2, password text + student_id int, barcode text, last_name text, first_name text, program_number text, + program_name text, email text, address_type text, street1 text, street2 text, + city text, province text, country text, postal_code text, phone text, profile int, + ident_type int, home_ou int, claims_returned_count int DEFAULT 0, usrname text, + net_access_level int DEFAULT 2, password text ); --Insert records from the staging table into the actor.usr table. INSERT INTO actor.usr ( - profile, usrname, email, passwd, ident_type, ident_value, first_given_name, family_name, day_phone, - home_ou, claims_returned_count, net_access_level) - SELECT profile, students.usrname, email, student_id, ident_type, student_id, first_name, last_name, - phone, home_ou, claims_returned_count, net_access_level FROM students; + profile, usrname, email, passwd, ident_type, ident_value, first_given_name, family_name, + day_phone, home_ou, claims_returned_count, net_access_level) + SELECT profile, students.usrname, email, student_id, ident_type, student_id, first_name, + last_name, phone, home_ou, claims_returned_count, net_access_level FROM students; --Insert records from the staging table into the actor.usr table. INSERT INTO actor.card (usr, barcode) diff --git a/1.6/admin/staffclientinstallation.xml b/1.6/admin/staffclientinstallation.xml index 259d6bd9bf..de727ac132 100644 --- a/1.6/admin/staffclientinstallation.xml +++ b/1.6/admin/staffclientinstallation.xml @@ -168,7 +168,8 @@ (adjust for your version of Evergreen): - + CFBundleExecutable -- 2.43.2