[1907] in Moira Commits
/svn/moira r4046 - trunk/moira/regtape
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Thu Aug 18 14:46:54 2011
Date: Thu, 18 Aug 2011 14:46:48 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201108181846.p7IIkmIx004840@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2011-08-18 14:46:48 -0400 (Thu, 18 Aug 2011)
New Revision: 4046
Modified:
trunk/moira/regtape/common.h
trunk/moira/regtape/staff.pc
trunk/moira/regtape/student.pc
trunk/moira/regtape/student.sql
Log:
Oh, rainBOWS. I like rainbows.
Modified: trunk/moira/regtape/common.h
===================================================================
--- trunk/moira/regtape/common.h 2011-07-28 20:01:59 UTC (rev 4045)
+++ trunk/moira/regtape/common.h 2011-08-18 18:46:48 UTC (rev 4046)
@@ -24,7 +24,7 @@
char *xphone2;
/* Only used by student load */
- char *school_code;
+ char *reg_type;
};
void fixphone(char *phone);
Modified: trunk/moira/regtape/staff.pc
===================================================================
--- trunk/moira/regtape/staff.pc 2011-07-28 20:01:59 UTC (rev 4045)
+++ trunk/moira/regtape/staff.pc 2011-08-18 18:46:48 UTC (rev 4046)
@@ -185,7 +185,7 @@
e.haddr = e.hphone = "";
/* Not used for employees. */
- e.school_code = "";
+ e.reg_type = "";
/* The following is really gross, but it happens to successfully convert
* new-style Warehouse office descriptions into (more-readable) old-style
Modified: trunk/moira/regtape/student.pc
===================================================================
--- trunk/moira/regtape/student.pc 2011-07-28 20:01:59 UTC (rev 4045)
+++ trunk/moira/regtape/student.pc 2011-08-18 18:46:48 UTC (rev 4046)
@@ -67,8 +67,8 @@
#define LEN_OADDR 30
#define LOC_OPHONE (LOC_OADDR + LEN_OADDR)
#define LEN_OPHONE 20
-#define LOC_SCHOOL_CODE (LOC_OPHONE + LEN_OPHONE)
-#define LEN_SCHOOL_CODE 2
+#define LOC_REG_TYPE (LOC_OPHONE + LEN_OPHONE)
+#define LEN_REG_TYPE 50
EXEC SQL BEGIN DECLARE SECTION;
int who;
@@ -139,7 +139,7 @@
while ((e = get_next_entry(in)))
{
/* Don't require secure registration for cross-registered students. */
- if (!strcmp(e->school_code, "Z"))
+ if (!strcmp(e->reg_type, "Cross-Registered"))
process_entry(e, 0);
else
process_entry(e, 1);
@@ -174,7 +174,7 @@
static char state[LEN_STATE + 1], phone[LEN_PHONE + 1];
static char ophone[LEN_OPHONE + 1], title[128];
static char zip[LEN_ZIP + 1], oaddr[LEN_OADDR + 1];
- static char school_code[LEN_SCHOOL_CODE + 1];
+ static char reg_type[LEN_REG_TYPE + 1];
static int nyear = 0;
int ends_jr, ends_iii, ends_iv, ends_sr, ends_ii, ends_v;
char *p;
@@ -220,8 +220,8 @@
strtrim(oaddr);
strlcpy(ophone, &buf[LOC_OPHONE], LEN_OPHONE + 1);
strtrim(ophone);
- strlcpy(school_code, &buf[LOC_SCHOOL_CODE], LEN_SCHOOL_CODE + 1);
- strtrim(school_code);
+ strlcpy(reg_type, &buf[LOC_REG_TYPE], LEN_REG_TYPE + 1);
+ strtrim(reg_type);
e.first = first;
e.last = last;
@@ -255,7 +255,7 @@
e.dept = course;
/* Used to detect cross-registered students. */
- e.school_code = school_code;
+ e.reg_type = reg_type;
e.oaddr = oaddr;
fixaddress(e.oaddr);
Modified: trunk/moira/regtape/student.sql
===================================================================
--- trunk/moira/regtape/student.sql 2011-07-28 20:01:59 UTC (rev 4045)
+++ trunk/moira/regtape/student.sql 2011-08-18 18:46:48 UTC (rev 4046)
@@ -1,8 +1,8 @@
set head off
set feedback off
set pagesize 0
-set linesize 256
+set linesize 512
spool /moira/load/student.input.unsorted
-select rpad(nvl(mit_id, ' '), 9, ' ') || rpad(nvl(last_name, ' '), 30, ' ') || rpad(nvl(first_name, ' '), 30, ' ') || rpad(nvl(middle_name, ' '), 30, ' ') || rpad(nvl(student_year, ' '), 1, ' ') || rpad(nvl(department, ' '), 4, ' ') || rpad(nvl(term_street1, ' '), 30, ' ') || rpad(nvl(term_city, ' '), 40, ' ') || rpad(nvl(term_state, ' '), 2, ' ') || rpad(nvl(term_zip, ' '), 9, ' ') || rpad(nvl(term_phone1, ' '), 20, ' ') || rpad(nvl(office_location, ' '), 30, ' ') || rpad(nvl(office_phone, ' '), 20, ' ') || rpad(nvl(school_code, ' '), 1, ' ') from wareuser.moira_student;
+select rpad(nvl(mit_id, ' '), 9, ' ') || rpad(nvl(last_name, ' '), 30, ' ') || rpad(nvl(first_name, ' '), 30, ' ') || rpad(nvl(middle_name, ' '), 30, ' ') || rpad(nvl(student_year, ' '), 1, ' ') || rpad(nvl(department, ' '), 4, ' ') || rpad(nvl(term_street1, ' '), 30, ' ') || rpad(nvl(term_city, ' '), 40, ' ') || rpad(nvl(term_state, ' '), 2, ' ') || rpad(nvl(term_zip, ' '), 9, ' ') || rpad(nvl(term_phone1, ' '), 20, ' ') || rpad(nvl(office_location, ' '), 30, ' ') || rpad(nvl(office_phone, ' '), 20, ' ') || rpad(nvl(reg_type, ' '), 50, ' ') from wareuser.moira_student;
spool off
quit
