remove remote FTP columns

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index a7678e6..b4caed0 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -15653,12 +15653,8 @@ SELECT  usr,
                        <field name="state_id"          reporter:datatype="int"      reporter:label="State ID"/>
                        <field name="contact_name"      reporter:datatype="text"     reporter:label="District Contact Person"/>
                        <field name="contact_email"     reporter:datatype="text"     reporter:label="District Contact Email"/>
-                       <field name="ftp_host"          reporter:datatype="text"     reporter:label="FTP Hostname"/>
-                       <field name="ftp_port"          reporter:datatype="integer"  reporter:label="FTP Custom Port"/>
-                       <field name="ftp_user"          reporter:datatype="text"     suppress_controller="open-ils.reporter-store"/>
-                       <field name="ftp_pass"          reporter:datatype="text"     suppress_controller="open-ils.reporter-store open-ils.pcrud"/>
-                       <field name="ftp_remote_dir"    reporter:datatype="text"     reporter:label="FTP Remote Directory"/>
-                       <field name="ftp_exceptions_dir"    reporter:datatype="text"     reporter:label="FTP Exceptions Directory"/>
+                       <field name="file_dir"          reporter:datatype="text"     reporter:label="Incoming File Directory"/>
+                       <field name="exceptions_dir"    reporter:datatype="text"     reporter:label="Exceptions Directory"/>
                        <field name="allow_expired"     reporter:datatype="bool"     reporter:label="Allow Expired Users"/>
                        <field name="block_list"        reporter:datatype="text"     reporter:label="Block List"/>
                        <field name="usr_activity_type" reporter:datatype="link"     reporter:label="User Activity Type"/>

diff --git a/Open-ILS/src/sql/Pg/600.schema.student_card.sql b/Open-ILS/src/sql/Pg/600.schema.student_card.sql
index 07d8103..98f1a4a 100644 (file)
--- a/Open-ILS/src/sql/Pg/600.schema.student_card.sql
+++ b/Open-ILS/src/sql/Pg/600.schema.student_card.sql
@@ -12,12 +12,8 @@ CREATE TABLE student_card.district (
     state_id            INTEGER NOT NULL UNIQUE,
     contact_name        TEXT,
     contact_email       TEXT,
-    ftp_host            TEXT NOT NULL,
-    ftp_port            INTEGER,
-    ftp_user            TEXT,
-    ftp_pass            VARCHAR(255), --TODO: encrypt this data with PGP
-    ftp_remote_dir      TEXT,
-    ftp_exceptions_dir  TEXT
+    file_dir            TEXT,
+    exceptions_dir      TEXT
 );
 
 CREATE TABLE student_card.school (

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.student_cards.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.student_cards.sql
index d59d072..885c9fc 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.student_cards.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.student_cards.sql
@@ -12,12 +12,8 @@ CREATE TABLE student_card.district (
     state_id            INTEGER NOT NULL UNIQUE,
     contact_name        TEXT,
     contact_email       TEXT,
-    ftp_host            TEXT NOT NULL,
-    ftp_port            INTEGER,
-    ftp_user            TEXT,
-    ftp_pass            VARCHAR(255), --TODO: encrypt this data with PGP
-    ftp_remote_dir      TEXT,
-    ftp_exceptions_dir  TEXT
+    file_dir            TEXT,
+    exceptions_dir      TEXT
 );
 
 CREATE TABLE student_card.school (