Igor Gariev (gariev) wrote in changelog,
Igor Gariev
gariev
changelog

[livejournal] r18662: Export of latest data from production

Committer: gariev
Export of latest data from production
U   trunk/bin/upgrading/base-data.sql
U   trunk/bin/upgrading/schools.dat
Modified: trunk/bin/upgrading/base-data.sql
===================================================================
--- trunk/bin/upgrading/base-data.sql	2011-03-22 07:03:25 UTC (rev 18661)
+++ trunk/bin/upgrading/base-data.sql	2011-03-22 07:42:27 UTC (rev 18662)
@@ -590,6 +590,8 @@
 UPDATE priv_list SET des='Allows a user to edit site text in a given language. arg=Unique language code, optionally appended by |domainid.domaincode',is_public='1',privname='Translate/Update Text',scope='general' WHERE privcode='translate';
 INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to add and remove entries from a vertical. arg=The vertical name, or \"*\" for all verticals', '0', 'vertical', 'Moderate Vertical', 'general');
 UPDATE priv_list SET des='Allows a user to add and remove entries from a vertical. arg=The vertical name, or \"*\" for all verticals',is_public='0',privname='Moderate Vertical',scope='general' WHERE privcode='vertical';
+INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to view entries that aren\'t otherwise available.  No argument means the user can view all entries, regardless of security.  Arg=\"suspended\" means the user can view public posts in a suspended journal.  All use is logged.', '0', 'viewall', 'View All Entries', 'general');
+UPDATE priv_list SET des='Allows a user to view entries that aren\'t otherwise available.  No argument means the user can view all entries, regardless of security.  Arg=\"suspended\" means the user can view public posts in a suspended journal.  All use is logged.',is_public='0',privname='View All Entries',scope='general' WHERE privcode='viewall';
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('FIPS', 'U.S. Census Bureau assigned two-digit FIPS (Federal Information Processing Standards) code for geographic sequence of each State within each census division.', 'zips');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('Name', 'Name of city.', 'zips');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('State', 'State.', 'zips');
@@ -603,6 +605,7 @@
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('actiontarget', 'Optional, but is likely some numeric value.', 'userlog');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('alloc', 'Allocation Factor (decimal portion of state within zipcode).', 'zips');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('allowmask', 'A bitmask to specify who can read the (non-public/non-private) entry. Bit 0 is for all friends (i.e., any defined friend can read it). Bits 1-30 are used for [dbtable[friendgroup2]]/[dbtable[friendgroup]]s. Bit 31 is reserved.', 'log2');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('anon', 'Whether the gift was sent anonymously', 'vgifts');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('answer', 'The answer text, in plaintext.', 'faq');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('anum', 'The access number. A random number between 0 and 255 associated with the entry to form the jitemid.', 'log2');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('area', 'The type of usage: \"L\" for log, \"T\" for talk, \"B\" for bio, \"P\" for pic.', 'dudata');
@@ -635,6 +638,7 @@
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('dateadd', 'Date code was create.', 'acctinvite');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('datecreate', 'Date the auth code was created.', 'authactions');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('dateins', 'The date the search was made.', 'dirsearchres2');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('daterecv', 'Date/time when the dift was received', 'vgifts');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('dateview', 'The time of the viewing.', 'faquses');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('day', 'The day of the eventtime. Duplicated for an index.', 'log2');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('dbid', 'The dbid from [dbtable[dbinfo]].', 'dbweights');
@@ -651,6 +655,7 @@
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('event', 'Journal entry text.', 'logtext2');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('eventtime', 'The time of the entry, supplied by the user / according to the user\'s system clock.', 'log2');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('expiretime', 'Unixtime. Can be 0, to mean \"never\".', 'subs');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('exptime', 'Date/time when the gift expires', 'vgifts');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('exptype', 'Session expiration type, the length a specific session should be defined for. \'short\' is 36 hours, \'long\' is 60 days,  \'once\' defaults to same length as \'short\'; just doesn\'t renew.', 'sessions');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('faqcat', 'The name of the main category the FAQ item belongs to. Is the index to [dbtable[faqcat]]', 'faq');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('faqid', 'The faqid of the [dbtable[faq]] item which was viewed.', 'faquses');
@@ -660,6 +665,9 @@
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('firstshowtime', 'The time when it was first highlighted to them (not at the show everything page).', 'cprod');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('fmt', 'Format of the uploaded image file. One of \'G\', \'J\', or \'P\', for GIF, JPEG, or PNG formats respectively.', 'userpic2');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('friendid', 'The [dbtable[user]].userid of the friend to watch/trust.', 'friends');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('giftid', 'The identifer of the vgift', 'vgifts');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('gifttype', 'Vgift type', 'vgifts');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('giverid', 'The user who sent the gift', 'vgifts');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('groupmask', 'A bitmask of 1 (1 << 0) OR\'ed with (1 << [dbtable[friendgroup]].groupnum) for each friendgroup this friend belongs to.', 'friends');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('groupname', 'Name given to the friend group.', 'friendgroup');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('groupnum', 'The group number. Can be 1-30.', 'friendgroup');
@@ -709,6 +717,7 @@
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('nodeid', 'The thread nodeid for the given nodetype to which this comment applies (probably the jitemid from the [dbtable[log2]] row).', 'talk2');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('nodetype', 'This field defines what type of thing in comment is in reply to. The value can be \"L\" = log item (journal entry), \"T\" = todo item.', 'talk2');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('norm', 'The normal weighting value for this dbid+role.', 'dbweights');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('note', 'Attached note displayed to the user', 'vgifts');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('nothankstime', 'Also a boolean: time/if user does not want to see it again.', 'cprod');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('ntypeid', 'The notification type from the [dbtable[notifytypelist]] table.', 'subs');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('numreaders', 'Stores syndicated feed account readership (number of users (watchers) who list account as a friend), assuming feed isn\'t stale, so we can get to it quicker for other things. Lets us know which feeds are unwatched - so we poll them less.', 'syndicated');
@@ -762,12 +771,14 @@
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('tpropid', 'Corresponds to unique tpropid in [dbtable[talkproplist]] of an individual comment property. Example: 10 (which might map to subjecticon in [dbtable[talkproplist]].', 'talkprop2');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('tpropid', 'Unique id of a comment property.', 'talkproplist');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('track', 'If the police or a court has contact us to track a user, we turn this on and activities are logged to the [dbtable[tracking]] table.', 'user');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('type', 'S - Owner, A - Maintainer, M - Moderator, P - member with posting access, N - unmoderated, B - banned, I - inviter.', 'reluser');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('ubefore', 'Units before (unit = 10 seconds).', 'weekuserusage');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('uniq', 'Value of the unique cookie.', 'uniqmap');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('updatetime', 'The date it was last updated.', 'includetext');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('upropid', 'Unique id for this meta-data property.', 'userproplist');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('userid', 'Community\'s userid from the [dbtable[user]] table.', 'community');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('userid', 'The owner of the subscription.', 'subs');
+REPLACE INTO schemacols (colname, des, tablename) VALUES ('userid', 'The user who received the gift', 'vgifts');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('userid', 'The userid doing the action, or 0 if user is unknown (as in support realm)', 'duplock');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('userid', 'The userid of the [dbtable[user]] making the change.', 'infohistory');
 REPLACE INTO schemacols (colname, des, tablename) VALUES ('userid', 'The userid of the [dbtable[user]] who added the friend.', 'friends');
@@ -931,6 +942,7 @@
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Global. Stores data of which users someone has listed as a \"friend\". Also stores the preferences on the friend item.', '0', 'off', NULL, 'friends');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Global. Stores data on a user\'s custom friends groups. Friends groups are used to restrict who can see an individual entry, or to filter the friends view. Please see also [dbtable[friendgroup2]].', '0', 'off', NULL, 'friendgroup');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Global. Stores database connection and replication info, instead of in the %LJ::DBINFO hash, for easier (web-based) management of LiveJournal installations with many databases.', '0', 'off', NULL, 'dbinfo');
+REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Global. Stores domains of translation system', '0', 'off', NULL, 'ml_domains');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Global. Stores each database\'s roles and weights. The [dbtable[dbinfo]] table keeps track of which databases exist.', '0', 'off', NULL, 'dbweights');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Global. Stores external user mappings. Note: extuser/extuserid are expected to sometimes be NULL, even though they are keyed. (Null values are not taken into account when using indexes).', '0', 'off', NULL, 'extuser');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Global. Stores flagged content metadata. Content can be flagged as adult content, etc.', '0', 'off', NULL, 'content_flag');
@@ -993,6 +1005,7 @@
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Stores per-user counters on the global (contrary to the name). These are allocated by the LJ::alloc_user_counter function. Please see also [dbtable[counter]].', '0', 'off', NULL, 'usercounter');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Stores the documentation for the database tables.', '0', 'replace', NULL, 'schematables');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Stores the documentation for the individual columns of the database tables.', '0', 'replace', NULL, 'schemacols');
+REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Stores the history of vgifts sent', '0', 'off', NULL, 'vgifts');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Unused. Designed for the \"Adopt-a-newbie\" system, but never fully implemented.', '0', 'off', NULL, 'adopt');
 REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Unused. Designed for the \"Adopt-a-newbie\" system, but never fully implemented.', '0', 'off', NULL, 'adoptlast');
 INSERT IGNORE INTO supportcat (allow_screened, basepoints, catkey, catname, hide_helpers, is_selectable, no_autoreply, public_help, public_read, replyaddress, scope, sortorder, user_closeable) VALUES ('1', '1', 'general', 'General/Unknown', '0', '1', '0', '0', '1', NULL, 'general', '2', '1');

Modified: trunk/bin/upgrading/schools.dat
===================================================================
--- trunk/bin/upgrading/schools.dat	2011-03-22 07:03:25 UTC (rev 18661)
+++ trunk/bin/upgrading/schools.dat	2011-03-22 07:42:27 UTC (rev 18662)
@@ -7,23 +7,21 @@
 "Saratoga High School","US","CA","Saratoga","http://www.saratogahigh.org"
 "Brigham Young University","US","UT","Provo","http://home.byu.edu/webapp/home/index.jsp"
 "Alameda High School","US","CA","Alameda",""
-"Ingersoll District Collegiate Institute","CA","On","Ingersoll","http://www.tvdsb.on.ca/IDCI/"
+"Ingersoll District Collegiate Institute","CA","ON","Ingersoll","http://www.tvdsb.on.ca/IDCI/"
 "Robbinsdale Cooper High School","US","MN","New Hope","http://www.rdale.k12.mn.us/chs"
 "Northwood High School","US","CA","Irvine","http://www.northwoodhigh.org/"
-"Cardinal Carter Academy for the Arts","CA","On","Toronto","http://www.cardinalcarter.com"
+"Cardinal Carter Academy for the Arts","CA","ON","Toronto","http://www.cardinalcarter.com"
 "Greater Johnstown High School","US","PA","Johnstown","http://trojan.gjsd.pa.us"
-"Kaj Munk College","NL","","Hoofddorp","http://www.kajmunk.nl"
+"Kaj Munk College","NL","Noord-Holland","Hoofddorp","http://www.kajmunk.nl"
 "Bishop Brady High School","US","NH","Concord","http://www.bishiopbrady.edu"
-"Oakland University","US","MI","Rochester Hills","http://www2.oakland.edu"
 "Interlachen High School","US","FL","Interlachen","http://www.ihsrams.net/"
 "Cathedral High School","US","IN","Indianapolis",""
-"Northern Virginia Community College","US","VA","Alexandria",""
-"University of Sheffield","UK","","Sheffield","http://www.shef.ac.uk"
+"Northern Virginia Community College - Alexandria","US","VA","Alexandria","http://www.nvcc.edu"
 "Lutheran High School of Orange County","US","CA","Orange","http://www.lhsoc.com"
 "Holy Names University","US","CA","Oakland","http://www.hnu.edu/"
 "Bethesda - Chevy Chase High School","US","MD","Bethesda","http://www.mcps.k12.md.us/schools/bcchs/index.shtm"
 "Ursuline School","US","NY","New Rochelle","http://www.ursuline.pvt.k12.ny.us/"
-"Mission Secondary School","CA","Bc","Mission","http://missionsecondary.sd75.mission.bc.ca/"
+"Mission Secondary School","CA","BC","Mission","http://missionsecondary.sd75.mission.bc.ca/"
 "Durham Academy Upper School","US","NC","Durham","http://da.org/"
 "West Mecklenburg High School","US","NC","Charlotte","http://www.cms.k12.nc.us/allschools/westmeck/"
 "St. John's University","US","MN","Collegeville","http://www.csbsju.edu"
@@ -33,71 +31,61 @@
 "Brooklyn Friends School","US","NY","Brooklyn","http://www.brooklynfriends.org"
 "Seton Hall University School of Law","US","NJ","Newark",""
 "University of Cincinnati","US","OH","Cincinnati","http://http//www.uc.edu"
-"St. Johns River Community College","US","FL","Palatka",""
+"St. Johns River Community College - Palatka","US","FL","Palatka","http://www.sjrcc.cc.fl.us/palcamp.html"
 "Wauconda High School","US","IL","Wauconda","http://www.cusd118.lake.k12.il.us/high/"
 "College of New Rochelle","US","NY","New Rochelle","http://www.cnr.edu/"
 "Oakville High School","US","MO","St. Louis",""
 "Easton High School","US","MD","Easton",""
-"Bayside High School","US","NY","Bayside",""
-"School of Environmental Studies at the Minnesota Zoo","US","MN","Apple Valley","http://www.isd196.k12.mn.us/schools/ses/"
+"Bayside High School","US","NY","Queens",""
 "Reseda High School","US","CA","Reseda","http://www.resedahighschool.com/"
 "Berry College","US","GA","Rome",""
 "Fair Haven Union High School","US","VT","Fair Haven",""
 "Cranston High School West","US","RI","Cranston","http://www.cps.k12.ri.us/chsw/"
-"Bilborough College","UK","","Nottingham","http://www.bilborough.ac.yk"
 "Cincinnati Christian University","US","OH","Cincinnati","http://www.ccuniversity.edu/"
-"McKinnon Secondary College","AU","Vic","Melbourne","http://www.mckinnonsc.vic.edu.au"
-"Apex High School","US","NC","Apex",""
+"McKinnon Secondary College","AU","VIC","Melbourne","http://www.mckinnonsc.vic.edu.au"
+"Apex High School","US","NC","Apex","http://www.apexhigh.com/"
 "St. Pius X High School","US","TX","Houston",""
 "Holyoke Catholic High School","US","MA","Holyoke","http://www.gaels.org/"
-"Kingwood Community College","US","TX","Kingwood",""
+"Lone Star College - Kingwood","US","TX","Kingwood","http://kingwood.lonestar.edu/"
 "Jefferson College","US","MO","Hillsboro","http://www.livejournal.com/community/jeff_co/)"
 "Tate High School","US","FL","Pensacola",""
 "Harlingen High School","US","TX","Harlingen",""
-"Mackenzie High School","CA","On","Deep River","http://www.renfrew.edu.on.ca/sec/mhs/index.htm"
+"Mackenzie High School","CA","ON","Deep River","http://www.renfrew.edu.on.ca/sec/mhs/index.htm"
 "Mount Saint Dominic Academy","US","NJ","Caldwell","http://www.msdacademy.org"
-"Stonehill College","US","MA","North Easton","http://www.stonehill.edu"
+"Stonehill College","US","MA","Easton","http://www.stonehill.edu/"
 "Southport High School","US","IN","Indianapolis",""
 "Metropolitan Community College","US","NE","Omaha","http://www.mccneb.edu/"
-"Lake Braddock Secondary","US","VA","Burke","http://www.fcps.edu/LakeBraddockSS"
 "Del Mar College","US","TX","Corpus Christi",""
 "Duluth High School","US","GA","Duluth","http://www.gwinnett.k12.ga.us/DuluthHS/"
 "Santa Fe High School","US","NM","Santa Fe",""
 "Kearns High School","US","UT","Kearns","http://www.graniteschools.org/hs/kearns/"
 "Dallas High School","US","OR","Dallas",""
-"John F. Ross C. V. I.","CA","On","Guelph","http://www.ugdsb.on.ca/jfr/"
-"Cheyenne High School","US","NV","Las Vegas","http://ccsd.net/schools/cheyenne/"
+"Cheyenne High School","US","NV","North Las Vegas","http://ccsd.net/schools/cheyenne/"
 "Southeastern Louisiana University","US","LA","Hammond","http://www.selu.edu"
 "McCallum High School","US","TX","Austin",""
 "St. Paul Central High School","US","MN","St. Paul","http://central.spps.org/"
-"Riverview High School","CA","Nb","Riverview","http://rhsroyals.nbed.nb.ca/"
+"Riverview High School","CA","NB","Riverview","http://rhsroyals.nbed.nb.ca/"
 "Brunswick High School","US","GA","Brunswick","http://www.glynn.k12.ga.us/BHS"
 "Pennington School","US","NJ","Pennington","http://www.pennington.org"
 "Paul V. Moore High School","US","NY","Central Square","http://www.cssd.org"
 "Western Oregon University","US","OR","Monmouth","http://www.wou.edu"
 "Paradise High School","US","CA","Paradise",""
-"St. Mary's Catholic High School","AE","","Dubai","http://www.stmarysdubai.com/"
-"Lyneham High School","AU","Act","Canberra","http://www.lynehamhs.act.edu.au/"
-"Cheyenne East High School","US","WY","Cheyenne","http://east.laramie1.k12.wy.us/Library/default.htm"
+"Lyneham High School","AU","ACT","North Canberra","http://www.lynehamhs.act.edu.au/"
 "Lutheran High School East","US","MI","Harper Woods","http://www.lhe.lhsa.com"
 "Massachusetts Bay Community College","US","MA","Wellesley","http://www.massbay.edu"
 "Timber Creek High School","US","FL","Orlando",""
 "Central Cabarrus High School","US","NC","Concord","http://www.cabarrus.k12.nc.us/central/"
 "Perry High School","US","GA","Perry",""
 "Altoona Area High School","US","PA","Altoona",""
-"Cayuga Community College","US","NY","Auburn","http://www.cayuga-cc.edu"
+"Cayuga Community College - Auburn Campus","US","NY","Auburn","http://www.cayuga-cc.edu"
 "Bishop O'Hara High School","US","PA","Dunmore",""
 "Shelton State Community College","US","AL","Tuscaloosa","http://www.sheltonstate.edu/sscc/"
 "Nouvel Catholic Central High School","US","MI","Saginaw","http://www.nouvel.org"
-"Fordham University","US","NY","Bronx","http://www.fordham.edu"
 "Pittsford Mendon High School","US","NY","Pittsford","http://pittsford.monroe.edu/pittsfordmendon/"
 "Fontbonne University","US","MO","St. Louis","http://www.fontbonne.edu"
 "Fauquier High School","US","VA","Warrenton",""
-"Woodrow Wilson High School","US","CA","Long Beach",""
 "Miami Beach High School","US","FL","Miami Beach",""
-"North Delta Senior Secondary","CA","Bc","North Delta",""
 "Burrell High School","US","PA","Lower Burrell",""
-"National Taiwan University","TW","","Taipei","http://www.ntu.edu.tw"
 "Rock Springs High School","US","WY","Rock Springs",""
 "Sandy Creek High School","US","GA","Tyrone",""
 "Lackey High School","US","MD","Indian Head","http://www.ccboe.com/lackey/"
@@ -109,26 +97,21 @@
 "Schenley High School","US","PA","Pittsburgh","http://schenleyhs.net"
 "Chancellor High School","US","VA","Fredericksburg","http://www.spotsylvania.k12.va.us/chhs/"
 "Hazard High School","US","KY","Hazard",""
-"Port Hope High School","CA","On","Port Hope",""
+"Port Hope High School","CA","ON","Port Hope",""
 "New Paltz Central High School","US","NY","New Paltz",""
-"Broadneck High School","US","MD","Annapolis",""
+"Broadneck High School","US","MD","Annapolis","http://www.broadneck.org/"
 "Olympic High School","US","WA","Silverdale","http://olhs.cksd.wednet.edu/"
-"Barbara Goleman High School","US","FL","Miami","http://www.dade.k12.fl.us/goleman/"
 "Southridge High School","US","OR","Beaverton","http://www.beaverton.k12.or.us/southridge/"
 "Indiana Area High School","US","PA","Indiana","http://www.iasd.cc/Junior%20High.htm"
 "Riverview High School","US","FL","Riverview","http://www.sdhc.k12.fl.us/~riverviewhigh.school/"
-"Lincoln Christ's Hospital School","UK","","Lincoln","http://www.christs-hospital.lincs.sch.uk/"
 "St. Joseph Academy","US","OH","Cleveland","http://www.stjoeacademy.org/"
 "Central High School","US","WY","Cheyenne","http://www.laramie1.k12.wy.us/central/"
 "Wolcott High School","US","CT","Wolcott",""
 "Scottsdale Community College","US","AZ","Scottsdale",""
-"Oxford University","UK","","Oxford","http://www.ox.ac.uk/"
 "Valdosta High School","US","GA","Valdosta",""
-"Los Angeles Pierce Community College","US","CA","Woodland Hills","http://www.piercecollege.com"
-"Cimarron-Memorial High School","US","NV","Las Vegas",""
+"Cimarron-Memorial High School","US","NV","Las Vegas","http://ccsd.net/schools/cimarron/"
 "Ygnacio Valley High School","US","CA","Concord","http://www.mdusd.k12.ca.us/ygnaciovalleyhigh/"
 "Art Institute of Pittsburgh","US","PA","Pittsburgh","http://www.aip.aii.edu"
-"California State Polytechnic University","US","CA","Pomona","http://www.csupomona.edu/"
 "Stonewall Jackson High School","US","VA","Manassas","http://www.sjraiders.org"
 "Independence High School","US","CA","San Jose","http://ih.esuhsd.org/"
 "Allen County-Scottsville High School","US","KY","Scottsville","http://www.allen.k12.ky.us/acshs/ACSHS%20HomePage/ACSHS%20Home.html"
@@ -142,83 +125,75 @@
 "William Floyd High School","US","NY","Mastic Beach",""
 "Greenwich Central School","US","NY","Greenwich","http://greenwichcsd.org/"
 "Sun Valley High School","US","NC","Monroe",""
-"University of Newcastle","AU","Nsw","Newcastle",""
-"Forest Hill High School","US","FL","West Palm Beach",""
+"University of Newcastle","AU","NSW","Newcastle",""
+"Forest Hill Community High School","US","FL","West Palm Beach",""
 "Hennepin Technical College","US","MN","Brooklyn Park","http://www.hennepintech.edu"
 "Our Lady of Victory Academy","US","NY","Dobbs Ferry",""
-"Waubonsee Community College","US","IL","Sugar Grove",""
-"University of Aberdeen","UK","","Aberdeen","http://www.abdn.ac.uk/"
+"Waubonsee Community College - Sugar Grove","US","IL","Sugar Grove",""
 "Palisades High School","US","PA","Kintnersville","http://www.palisadessd.org/palisades/site/default.asp"
 "Emmaus High School","US","PA","Emmaus","http://www.eastpennsd.org/ehs"
 "Rockhurst University","US","MO","Kansas City","http://www.rockhurst.edu"
 "Austin Community College","US","TX","Austin","http://www.austincc.edu/"
 "Gilbert School","US","CT","Winsted",""
 "Padua Franciscan High School","US","OH","Parma","http://www.paduafranciscan.com/"
-"Willetton High School","AU","Wa","Perth",""
+"Willetton Senior High School","AU","WA","Perth","http://www.willettonshs.wa.edu.au/"
 "Lafayette Charter High School","US","LA","Lafayette",""
 "Lee College","US","TX","Baytown",""
 "Fitchburg State College","US","MA","Fitchburg","http://www.fsc.edu"
 "Perry County Central High School","US","KY","Hazard","http://www.perry.k12.ky.us/PCCHSWeb/default.htm"
-"Wylie E. Groves High School","US","MI","Beverly Hills",""
-"McMaster University","CA","Ont","Hamilton","http://www.mcmaster.ca"
+"Wylie E. Groves High School","US","MI","Beverly Hills","http://www.birmingham.k12.mi.us/Schools/High+Schools/Groves/"
+"McMaster University","CA","ON","Hamilton","http://www.mcmaster.ca"
 "Mead High School","US","WA","Spokane","http://mhs.mead.k12.wa.us/"
 "Coe College","US","IA","Cedar Rapids","http://www.coe.edu"
 "Five Towns College","US","NY","Dix Hills","http://www.ftc.edu"
 "Grand Blanc High School","US","MI","Grand Blanc","http://hswww.grand-blanc.k12.mi.us"
-"University of Wisconsin","US","WI","Milwaukee","http://www.uwm.edu"
 "Niles West High School","US","IL","Skokie","http://www.niles-hs.k12.il.us/west/"
 "Arsenal Technical High School","US","IN","Indianapolis",""
 "Santa Fe High School","US","FL","Alachua",""
 "Chopticon High School","US","MD","Morganza","http://www.smcps.k12.md.us/chs/A-index.htm"
 "Pleasantville High School","US","NJ","Pleasantville",""
 "Blaine High School","US","MN","Blaine",""
-"Silver Valley High School","US","CA","Yermo",""
+"Silver Valley High School","US","CA","Yermo","http://www.silvervalley.k12.ca.us/~svhs/"
 "Fort Lewis College","US","CO","Durango","http://www.fortlewis.edu"
-"University of North Carolina","US","NC","Charlotte","http://www.uncc.edu"
-"Lake Worth Community High School","US","FL","Lake Worth",""
+"University of North Carolina - Charlotte","US","NC","Charlotte","http://www.uncc.edu"
 "Washington and Jefferson College","US","PA","Washington","http://www.washjeff.edu"
 "Las Cruces High School","US","NM","Las Cruces",""
-"Hamilton District Christian High School","CA","On","Hamilton","http://www.hdch.org"
+"Hamilton District Christian High School","CA","ON","Hamilton","http://www.hdch.org"
 "West Windsor - Plainsboro High School North","US","NJ","Plainsboro",""
 "Tomales High School","US","CA","Tomales","http://shoreline.marin.k12.ca.us/tomaleshi/"
 "Bishop Kenny High School","US","FL","Jacksonville","http://www.bishopkenny.org/"
 "Pendleton High School","US","OR","Pendleton",""
 "Mansfield High School","US","MA","Mansfield",""
-"University of Akron","US","OH","Akron",""
+"University of Akron","US","OH","Akron","http://www.uakron.edu/"
 "Hall High School","US","AR","Little Rock","http://www.lrsd.org/schoolindex.cfm?sccode=02"
-"Wyoming Valley West","US","PA","Plymouth","http://www.wvwspartans.org"
-"North West Vista College","US","TX","San Antonio","http://www.accd.edu/nvc/"
 "Hilbert College","US","NY","Hamburg","http://www.hilbert.edu"
 "Austin College","US","TX","Sherman","http://www.austincollege.edu"
 "Encinal High School","US","CA","Alameda",""
 "Edwardsville High School","US","IL","Edwardsville",""
 "Coyle and Cassidy Memorial High School","US","MA","Taunton","http://www.coylecassidy.com"
-"De la Salle University","PH","","Manila",""
-"Suncoast Community High School","US","FL","Riviera Beach",""
+"Suncoast Community High School","US","FL","Riviera Beach","http://suncoasths.palmbeach.k12.fl.us/"
 "Honeoye Falls- Lima High School","US","NY","Honeoye Falls","http://www.hflcsd.org"
 "Theodore Roosevelt High School","US","MI","Wyandotte","http://rhs.wyandotte.org/"
 "Panola College","US","TX","Carthage","http://www.panola.edu"
 "Mary Institute and Saint Louis Country Day School","US","MO","St. Louis","http://www.micds.org"
-"University of California","US","CA","Berkeley","http://www.berkeley.edu"
-"Lake Joondalup Baptist College","AU","Wa","Perth",""
+"Lake Joondalup Baptist College","AU","WA","Perth",""
 "Calabasas High School","US","CA","Calabasas",""
 "Bossier High School","US","LA","Bossier City",""
 "Waynesboro Area High School","US","PA","Waynesboro","http://www.wasd.k12.pa.us/schools/senior/"
 "Statesboro High School","US","GA","Statesboro",""
 "Saugus High School","US","MA","Saugus",""
 "Lyons Township High School","US","IL","La Grange","http://www.lths.net/"
-"Roosevelt High School","US","MI","Wyandotte",""
 "Garden City High School","US","NY","Garden City","http://highschool.gardencity.k12.ny.us"
 "Neosho High School","US","MO","Neosho","http://www.neoshor5.edu"
 "Art Institute of Washington","US","VA","Rosslyn","http://www.aiw.artinstitutes.edu/"
 "Englewood High School","US","CO","Englewood","http://englewoodschools.org/ehs"
-"Fredericton High School","CA","Nb","Fredericton",""
+"Fredericton High School","CA","NB","Fredericton",""
 "North Central Michigan College","US","MI","Petoskey","http://www.ncmc.cc.mi.us"
 "Clover Hill High School","US","VA","Midlothian",""
 "Los Gatos High School","US","CA","Los Gatos","http://www.lghs.net"
 "Northern Highlands Regional High School","US","NJ","Allendale","http://www.northernhighlands.org/"
 "Ashland High School","US","MA","Ashland","http://www.ashlandhs.org"
-"Eau Gallie High School","US","FL","Melbourne",""
+"Eau Gallie High School","US","FL","Melbourne","http://eaugallie.hs.brevard.k12.fl.us/"
 "Potsdam High School","US","NY","Potsdam","http://www.potsdam.k12.ny.us/"
 "J. Sterling Morton East High School","US","IL","Cicero","http://www.theramp.net/dist201/east.html"
 "Vassar College","US","NY","Poughkeepsie","http://www.vassar.edu"
@@ -239,17 +214,15 @@
 "Drury University","US","MO","Springfield",""
 "Rhodes College","US","TN","Memphis","http://www.rhodes.edu"
 "Crestwood High School","US","MI","Dearborn Heights",""
-"D.W. Poppy Secondary School","CA","Bc","Langley","http://www.sd35.bc.ca/dwp"
+"D.W. Poppy Secondary School","CA","BC","Langley","http://www.sd35.bc.ca/dwp"
 "La Roche College","US","PA","Pittsburgh","http://www.laroche.edu/"
 "Fort Vancouver High School","US","WA","Vancouver",""
-"John Diefenbaker Secondary School","CA","On","Hanover",""
-"Oak Park-River Forest High School","US","IL","Oak Park","http://www.oprfhs.org/"
-"Portobello High School","UK","","Edinburgh",""
+"John Diefenbaker Secondary School","CA","ON","Hanover",""
 "Lake-Sumter Community College","US","FL","Leesburg","http://iscc.edu"
 "United States Air Force Academy","US","CO","Colorado Springs","http://www.usafa.af.mil"
-"L'anse Creuse High School Central","US","MI","Harrison Township","http://www.lc-ps.org/Schools/LCHS"
+"L'anse Creuse High School","US","MI","Harrison Township","http://www.lc-ps.org/Schools/LCHS"
 "Revere High School","US","MA","Revere","http://www.revereps.mec.edu/"
-"Holy Trinity Academy","CA","Ab","Okotoks","http://www.redeemer.ab.ca/hta.htm"
+"Holy Trinity Academy","CA","AB","Okotoks","http://www.redeemer.ab.ca/hta.htm"
 "Elmira Free Academy","US","NY","Elmira",""
 "Sinclair Community College","US","OH","Dayton","http://www.sinclair.edu"
 "Highland Park High School","US","NJ","Highland Park",""
@@ -257,18 +230,17 @@
 "Ottawa Township High School","US","IL","Ottawa",""
 "Eugene Lang College","US","NY","New York","http://www.lang.edu"
 "Notre Dame High School","US","CA","Salinas","http://www.nd-spirits.org/"
-"Palos Verdes Peninsula High School","US","CA","Rolling Hills Estates","http://www.pvphs.com"
 "Queen of Peace High School","US","NJ","North Arlington","http://www.qphs.org"
 "Saratoga Springs High School","US","NY","Saratoga Springs",""
 "Monroe High School","US","OH","Monroe","http://www.monroelocalschools.com/schools/senior_high/index.cfm"
 "Meadows School","US","NV","Las Vegas",""
 "Grand Forks Central High School","US","ND","Grand Forks",""
-"University of Arizona","US","AZ","Tucson","http://www.arizona.edu/"
+"University of Arizona - Tucson","US","AZ","Tucson","http://www.arizona.edu/"
 "Federal Way High School","US","WA","Federal Way",""
 "Ontario High School","US","CA","Ontario",""
 "Donna High School","US","TX","Donna",""
-"University of Massachusetts","US","MA","Amherst","http://www.umass.edu"
-"University of Illinois","US","IL","Springfield",""
+"University of Massachusetts - Amherst","US","MA","Amherst","http://www.umass.edu/"
+"University of Illinois - Springfield","US","IL","Springfield",""
 "Spring-Ford High School","US","PA","Royersford","http://www.spring-ford.net/buildings/seniorhigh/pages/MainPages/schoolinfo.htm"
 "Waltrip High School","US","TX","Houston",""
 "Oceanside High School","US","CA","Oceanside",""
@@ -278,21 +250,18 @@
 "Staunton River High School","US","VA","Moneta","http://www.bedford.k12.va.us/srhs/Main.htm"
 "Uniontown Area High School","US","PA","Uniontown","http://www.uniontown.k12.pa.us/"
 "Lexington High School","US","SC","Lexington","http://www.lexington1.net/lhs/"
-"London South Secondary School","CA","On","London","http://www.tvdsb.on.ca/south/home.asp"
+"London South Secondary School","CA","ON","London","http://www.tvdsb.on.ca/south/home.asp"
 "American River College","US","CA","Sacramento","http://www.arc.losrios.edu/"
-"Full Sail","US","FL","Winter Park","http://fullsail.com"
-"Charlottetown Rural High School","CA","Pe","Charlottetown","http://www.edu.pe.ca/rural/"
+"Charlottetown Rural High School","CA","PE","Charlottetown","http://www.edu.pe.ca/rural/"
 "Mt. Rainier High School","US","WA","Des Moines","http://www.hsd401.org/mtrainier"
 "Clinton High School","US","MS","Clinton",""
 "Coronado High School","US","NV","Henderson","http://coronadocougars.net"
-"Jarvis Collegiate Institute","CA","On","Toronto","http://schools.tdsb.on.ca/jarvisci/"
+"Jarvis Collegiate Institute","CA","ON","Toronto","http://schools.tdsb.on.ca/jarvisci/"
 "Glenwood Community High School","US","IA","Glenwood","http://www.glenwoodschools.org/hs/"
-"Palm Bay High School","US","FL","Melbourne",""
+"Palm Bay High School","US","FL","Melbourne","http://palmbay.hs.brevard.k12.fl.us/"
 "Belmont High School","US","NH","Belmont","http://highschool.shaker.k12.nh.us/"
 "Redlands East Valley High School","US","CA","Redlands","http://www.rev.redlands.k12.ca.us/"
 "Davidson College","US","NC","Davidson","http://www.davidson.edu"
-"Ross University School of Veterinary Medicine","KN","","Basseterre","http://www.rossvet.edu.kn/"
-"Epsom Girls' Grammar School","NZ","","Auckland","http://www.eggs.school.nz"
 "Dutch Fork High School","US","SC","Irmo",""
 "Streamwood High School","US","IL","Streamwood",""
 "Columbia River High School","US","WA","Vancouver","http://river.vansd.org/"
@@ -301,16 +270,15 @@
 "Corning-Painted Post West High School","US","NY","Painted Post",""
 "College of the Siskiyous","US","CA","Weed","http://www.siskiyous.edu"
 "Lagrange High School","US","LA","Lake Charles",""
-"University of Southern Maine","US","ME","Gorham",""
+"University of Southern Maine - Gorham Campus","US","ME","Gorham","http://www.usm.maine.edu/"
 "North Carolina Agricultural and Technical State University","US","NC","Greensboro","http://www.ncat.edu"
 "Stoughton High School","US","MA","Stoughton",""
 "Cardinal Stritch University","US","WI","Milwaukee","http://www.stritch.edu"
 "Glen Rock High School","US","NJ","Glen Rock",""
 "Cypress Falls High School","US","TX","Houston","http://schools.cfisd.net/cyfalls/index.stm"
 "Casper College","US","WY","Casper","http://www.caspercollege.edu/"
-"Moscow State Technical University N.A. N.E. Bauman","RU","","Moscow","http://www.mgtu.ru/mstu/English/"
-"Floral Park Memorial High School","US","NY","Floral Park",""
-"Montague Regional High School","CA","Pe","Montague","http://www.edu.pe.ca/montaguehigh/"
+"Floral Park Memorial High School","US","NY","Floral Park","http://www.sewanhaka.k12.ny.us/~fpmweb/"
+"Montague Regional High School","CA","PE","Montague","http://www.edu.pe.ca/montaguehigh/"
 "Tolland High School","US","CT","Tolland","http://www.tolland.k12.ct.us/ths"
 "Auburn High School","US","IL","Rockford","http://auburn.rps205.com/"
 "Wor-Wic Community College","US","MD","Salisbury","http://www.worwic.cc.md.us/"
@@ -318,8 +286,7 @@
 "Southern Maine Community College","US","ME","South Portland",""
 "Peabody Veterans Memorial High School","US","MA","Peabody",""
 "Country Day School of the Sacred Heart","US","PA","Bryn Mawr","http://www.cdssh.org"
-"University of Saint Andrews","UK","","St. Andrews","http://www.st-andrews.ac.uk"
-"School of Oriental and African Studies","UK","","London","http://www.soas.ac.uk"
+"University of St  Andrews","UK","Scotland - Fife","St Andrews","http://www.st-andrews.ac.uk"
 "Hope College","US","MI","Holland","http://www.hope.edu"
 "Sam Houston High School","US","TX","Arlington",""
 "Milwaukee Area Technical College","US","WI","Milwaukee","http://www.matc.edu"
@@ -342,23 +309,21 @@
 "Astronaut High School","US","FL","Titusville","http://astronaut.hs.brevard.k12.fl.us/"
 "Chaska High School","US","MN","Chaska","http://www.district112.org/chs/"
 "El Molino High School","US","CA","Forestville",""
-"Sunset High School","US","OR","Beaverton","http://www.beaverton.k12.or.us/sunset/"
 "Meridian High School","US","MS","Meridian","http://www.meridian.k12.ms.us/mh/index.html"
 "Our Lady Academy","US","MS","Bay Saint Louis","http://www.ourladyacademy.com"
 "Druid Hills High School","US","GA","Decatur","http://www.dekalb.k12.ga.us/~druidhills/"
 "Burlington High School","US","MA","Burlington",""
 "East Longmeadow High School","US","MA","East Longmeadow","http://www.eastlongmeadow.org/High_School/index.htm"
-"John B. Connally High School","US","TX","Austin",""
-"Henderson County High School","US","KY","Henderson",""
+"Connally High School","US","TX","Austin","http://www.pflugervilleisd.net/CHS/"
+"Henderson County High School","US","KY","Henderson","http://www.hchs.henderson.k12.ky.us"
 "San Francisco School of the Arts","US","CA","San Francisco","http://www.sfsota.org/"
 "Lebanon High School","US","VA","Lebanon","http://www.russell.k12.va.us/lhs/"
 "Winthrop University","US","SC","Rock Hill",""
-"Haverford High School","US","PA","Havertown","http://www.haverford.k12.pa.us/hhs.html"
-"Norfolk High School","US","NE","Norfolk","http://www.npsne.org/nhs/index.htm"
+"Norfolk Senior High School","US","NE","Norfolk","http://www.npsne.org/nhs/index.htm"
 "Fresno City College","US","CA","Fresno",""
 "Hancock High School","US","MS","Kiln",""
 "Lake Central High School","US","IN","St. John",""
-"University of North Carolina","US","NC","Wilmington","http://www.uncw.edu"
+"University of North Carolina at Wilmington","US","NC","Wilmington","http://www.uncw.edu"
 "Hillcrest High School","US","TX","Dallas",""
 "Texas Woman's University","US","TX","Denton","http://www.twu.edu"
 "La Vergne High School","US","TN","La Vergne","http://www.lhs.rcs.k12.tn.us/dept/athletic/baseballschedule.html"
@@ -369,24 +334,20 @@
 "Sul Ross State University","US","TX","Alpine","http://www.sulross.edu"
 "Masters School","US","NY","Dobbs Ferry","http://www.themastersschool.com/"
 "Quabbin Regional High School","US","MA","Barre","http://www.quabbin.k12.ma.us"
-"Victoria High School","CA","Bc","Victoria","http://www.vichigh.sd61.bc.ca"
+"Victoria High School","CA","BC","Victoria","http://www.vichigh.sd61.bc.ca"
 "Oklahoma Christian University","US","OK","Oklahoma City","http://www.oc.edu"
 "Rancho High School","US","NV","Las Vegas","http://ccsd.net/schools/rancho/"
-"Tuscaloosa County High School","US","AL","Northport",""
+"Tuscaloosa County High School","US","AL","Northport","http://tuscaloosa.tcs.schoolinsites.com/"
 "Henry Ford Community College","US","MI","Dearborn",""
-"Nazareth College of Rochester","US","NY","Rochester","http://www.naz.edu/"
 "Shorecrest High School","US","WA","Shoreline",""
 "Carver High School","US","MA","Carver",""
 "Vail High School","US","AZ","Tucson","http://www.vailhs.net/"
-"Concordia University","CA","Pq","Montreal","http://www.concordia.ca"
 "Cleveland State Community College","US","TN","Cleveland",""
-"Central Saint Martins School of Art and Design","UK","","London","http://www.csm.arts.ac.uk/"
 "Carlow University","US","PA","Pittsburgh","http://www.carlow.edu"
-"Bishop Strachan School","CA","On","Toronto",""
+"Bishop Strachan School","CA","ON","Toronto",""
 "Rockbridge County High School","US","VA","Lexington","http://www.rcs.rang.k12.va.us/"
-"Universiteit Van","NL","","Amsterdam","http://www.uva.nl/"
 "Menlo-Atherton High School","US","CA","Atherton","http://www.mabears.org"
-"York House School","CA","Bc","Vancouver","http://www.yorkhouse.ca"
+"York House School","CA","BC","Vancouver","http://www.yorkhouse.ca"
 "Canfield High School","US","OH","Canfield",""
 "Art Center College of Design","US","CA","Pasadena","http://www.artcenter.edu/"
 "Walsh Jesuit High School","US","OH","Cuyahoga Falls",""
@@ -394,52 +355,44 @@
 "Franklin Regional High School","US","PA","Murrysville","http://www.franklinregional.k12.pa.us/"
 "Carmel Catholic High School","US","IL","Mundelein","http://carmel.k12.il.us/"
 "William Marsh Rice University","US","TX","Houston","http://www.rice.edu"
-"Miami University of Ohio","US","OH","Oxford","http://www.muohio.edu"
+"Miami University","US","OH","Oxford","http://www.muohio.edu"
 "Derby High School","US","KS","Derby",""
-"Moanalua High School","US","HI","Honolulu",""
+"Moanalua High School","US","HI","Honolulu","http://www.mohs.k12.hi.us/"
 "Hammond High School","US","IN","Hammond",""
-"Barrie North Collegiate","CA","On","Barrie","http://bnc.scdsb.on.ca/"
+"Barrie North Collegiate","CA","ON","Barrie","http://bnc.scdsb.on.ca/"
 "Otsego High School","US","MI","Otsego","http://otsegobulldogs.org"
 "Howland High School","US","OH","Warren",""
-"Latymer Upper School","UK","","London","http://www.latymer-upper.org"
 "Westminster High School","US","CA","Westminster",""
-"Vancouver Community College","CA","Bc","Vancouver","http://www.vcc.bc.ca"
-"St. Francis High School","US","MI","Traverse City","http://www.gtacs.org/sfhs.php"
-"Montana State University","US","MT","Billings",""
-"University of Minnesota - Twin Cities","US","MN","Minneapolis/st. Paul","http://www.umn.edu"
+"Vancouver Community College","CA","BC","Vancouver","http://www.vcc.bc.ca"
+"St. Francis High School","US","MI","Traverse City","http://www.gtacs.org/sf_home.php"
+"Montana State University - Billings","US","MT","Billings",""
 "Lyman High School","US","FL","Longwood",""
 "Cortez High School","US","AZ","Phoenix",""
 "Harford Technical High School","US","MD","Bel Air","http://www.harfordtech.net//"
-"University of Bristol","UK","","Bristol","http://www.bris.ac.uk"
 "Pikeville College","US","KY","Pikeville","http://pc.edu"
 "University of Dayton","US","OH","Dayton","http://www.udayton.edu"
 "Sandra Day O'Connor High School","US","TX","San Antonio",""
-"Glen Waverley Secondary College","AU","Vic","Melbourne",""
-"Dargaville High School","NZ","","Dargaville","http://www.igrin.co.nz/~darghigh/"
+"Glen Waverley Secondary College","AU","VIC","Melbourne","http://www.gwsc.vic.edu.au/"
 "Anthony Wayne High School","US","OH","Whitehouse",""
 "Southfield-Lathrup High School","US","MI","Southfield","http://www.southfield.k12.mi.us/itc/slathrup.htm"
 "Rio Americano High School","US","CA","Sacramento",""
-"Waterford Mott High School","US","MI","Waterford",""
-"Richmond, the American International University In","UK","","London","http://www.richmond.ac.uk"
+"Waterford Mott High School","US","MI","Waterford","http://www.motths.org/"
 "Cloquet High School","US","MN","Cloquet",""
 "Ardmore High School","US","OK","Ardmore",""
 "Otterbein College","US","OH","Westerville","http://www.otterbein.edu"
 "Oviedo High School","US","FL","Oviedo",""
 "Charter School of Wilmington","US","DE","Wilmington","http://www.charterschool.org"
-"Penn State Erie, the Behrend College","US","PA","Erie","http://www.pserie.psu.edu"
+"Penn State Erie, the Behrend College","US","PA","Erie","http://www.pserie.psu.edu/"
 "New England Institute of Technology","US","RI","Warwick",""
 "Santa Susana High School","US","CA","Simi Valley",""
-"Bishop Druitt College","AU","Nsw","Coffs Harbour",""
-"Art Institute of California, Orange County","US","CA","Santa Ana","http://www.aicaoc.artinstitutes.edu/"
+"Bishop Druitt College","AU","NSW","Coffs Harbour",""
+"Art Institute of California - Orange County","US","CA","Santa Ana","http://www.artinstitutes.edu/orangecounty/"
 "Oberlin College","US","OH","Oberlin","http://www.oberlin.edu"
 "Omaha North High School","US","NE","Omaha","http://www.ops.org/north/"
 "Duquesne University","US","PA","Pittsburgh","http://www.duq.edu"
 "Haddon Township High School","US","NJ","Westmont","http://www.haddon.k12.nj.us/hths/HTHS.html"
 "Brighton High School","US","UT","Salt Lake City","http://www.bhs.jordan.k12.ut.us"
-"New England Conservatory of Music","US","MA","Boston","http://www.newenglandconservatory.edu/"
 "College of the Canyons","US","CA","Valencia","http://www.canyons.edu"
-"Metropolitan State College","US","CO","Denver",""
-"Our Lady of Lourdes","US","NY","Poughkeepsie",""
 "Raritan Valley Community College","US","NJ","Branchburg","http://www.raritanval.edu"
 "Plymouth Regional High School","US","NH","Plymouth",""
 "Kutztown University of Pennsylvania","US","PA","Kutztown","http://www.kutztown.edu"
@@ -452,8 +405,8 @@
 "Grossmont High School","US","CA","El Cajon","http://grossmont.guhsd.net/"
 "T. L. Hanna High School","US","SC","Anderson",""
 "Atascadero High School","US","CA","Atascadero","http://www.atas.k12.ca.us/ausd/ahs/"
-"Dr. Michael M. Krop High School","US","FL","Miami",""
-"Basehor-Linwood High School","US","KS","Basehor",""
+"Dr. Michael M. Krop High School","US","FL","Miami","http://mkhs.dadeschools.net/"
+"Basehor-Linwood High School","US","KS","Basehor","http://www.usd458.org/blhs/default.htm"
 "West Chester University of Pennsylvania","US","PA","West Chester","http://www.wcupa.edu"
 "Our Lady of Nazareth Academy","US","MA","Wakefield","http://www.ourladyofnazarethacademy.org/"
 "Menomonie High School","US","WI","Menomonie","http://msd.k12.wi.us/schools/highschool/"
@@ -462,11 +415,11 @@
 "Community College of Allegheny County","US","PA","Pittsburgh","http://www.ccac.edu/"
 "McDowell High School","US","PA","Erie",""
 "Bishop England High School","US","SC","Charleston","http://www.behs.com"
-"Suffolk County Community College","US","NY","Selden","http://apps5.oingo.com/apps/domainpark/domainpark.cgi?s=fjwhfekh42.com&dp_lp=24&dp_lp=7&cid=DTRG7F6V&dp_p4pid=oingo_inclusion_xm"
+"Suffolk County Community College - Ammerman","US","NY","Selden","http://apps5.oingo.com/apps/domainpark/domainpark.cgi?s=fjwhfekh42.com&dp_lp=24&dp_lp=7&cid=DTRG7F6V&dp_p4pid=oingo_inclusion_xm"
 "Novi High School","US","MI","Novi","http://www.novi.k12.mi.us/Schools/noviHigh/default.aspx"
 "Livermore Falls High School","US","ME","Livermore Falls","http://lfhs.sad36.org/"
 "Akiba Hebrew Academy","US","PA","Merion Station",""
-"California State University","US","CA","San Bernardino","http://csusb.edu"
+"California State University - San Bernardino","US","CA","San Bernardino","http://csusb.edu"
 "University of Mobile","US","AL","Mobile","http://www.umobile.edu"
 "Metro Academic and Classical High School","US","MO","St. Louis",""
 "Poughkeepsie Day School","US","NY","Poughkeepsie","http://www.poughkeepsieday.org/"
@@ -477,89 +430,75 @@
 "Brearley School","US","NY","New York","http://www.brearley.org/"
 "Tappan Zee High School","US","NY","Orangeburg","http://www.socsd.org/tzh/index.htm"
 "Mount Pleasant High School","US","DE","Wilmington","http://www.mphsknights.com/"
-"Mercedes College","AU","Wa","Perth",""
+"Mercedes College","AU","WA","Perth",""
 "Loomis Chaffee School","US","CT","Windsor","http://loomis.org"
 "New Haven High School","US","IN","New Haven",""
-"St. Francis Desales","US","OH","Columbus","http://www.cdeducation.org/schools/ds/"
 "McKinney North High School","US","TX","McKinney","http://www.mckinneyisd.net/Campuses/school_websites/mnhs/"
 "Lakes High School","US","WA","Lakewood",""
 "Andalusia High School","US","AL","Andalusia",""
 "Mark Morris High School","US","WA","Longview","http://www.longview.k12.wa.us/mmhs/"
-"Harrison Trimble High School","CA","Nb","Moncton","http://www.harrisontrimble.ca/"
-"Marquette High School","US","MI","Marquette","http://www.mapsnet.org"
+"Harrison Trimble High School","CA","NB","Moncton","http://www.harrisontrimble.ca/"
+"Marquette Senior High School","US","MI","Marquette",""
 "Oregon State University","US","OR","Corvallis","http://oregonstate.edu/"
 "Catlin Gabel School","US","OR","Portland","http://www.catlin.edu"
 "King George High School","US","VA","King George","http://www.kgcs.k12.va.us/kghs/index.htm"
 "East Rowan High School","US","NC","Salisbury","http://www.eastrowan.com"
 "Columbia High School","US","NJ","Maplewood",""
-"Ormiston College","AU","Qld","Brisbane","http://www.ormistoncollege.com"
-"Iowa City City High School","US","IA","Iowa City",""
-"Pioneer Valley Performing Arts Charter High School","US","MA","Hadley",""
+"Pioneer Valley Performing Arts Charter Public School","US","MA","Hadley","http://www.pvpa.org/"
 "Auburn University","US","AL","Auburn","http://www.auburn.edu"
-"L'anse Creuse High School","US","MI","Harrison Twp",""
-"University of Texas","US","TX","Dallas",""
-"D'youville College","US","NY","Buffalo","http://www.dyc.edu"
+"University of Texas - Dallas","US","TX","Dallas",""
+"D'Youville College","US","NY","Buffalo","http://www.dyc.edu"
 "Sandusky High School","US","OH","Sandusky",""
-"Dimond High School","US","AK","Anchorage",""
-"West Vancouver Secondary School","CA","Bc","West Vancouver","http://www.sd45.bc.ca/wvss/"
+"West Vancouver Secondary School","CA","BC","West Vancouver","http://www.sd45.bc.ca/wvss/"
 "Advanced Technology Center","US","FL","Daytona Beach","http://www.advancedtechcenter.org/"
 "Bolton High School","US","LA","Alexandria",""
-"Marianna High School","US","FL","Marianna",""
-"College of Saint Rose","US","NY","Albany","http://www.strose.edu"
+"Marianna High School","US","FL","Marianna","http://150.176.80.100/"
+"The College of Saint Rose","US","NY","Albany","http://www.strose.edu"
 "Eastern Illinois University","US","IL","Charleston","http://www.eiu.edu"
 "University of Saint Thomas","US","MN","St. Paul",""
 "Pasco High School","US","FL","Dade City",""
 "Mount Olive High School","US","NJ","Flanders",""
-"Bucks County Community College","US","PA","Newtown",""
 "Redford Union High School","US","MI","Redford",""
-"Macomb Community College","US","MI","Clinton Township","http://www.macomb.edu"
+"Macomb Community College","US","MI","Clinton","http://www.macomb.edu"
 "Douglas High School","US","NV","Minden",""
 "Center High School","US","CA","Antelope",""
-"Todd County Central High School","US","KY","Elkton","http://www.todd.k12.ky.us/TCCHS/high.html"
+"Todd County Central High School","US","KY","Elkton","http://www.todd.k12.ky.us/TCCHS/"
 "Van Nuys High School","US","CA","Van Nuys",""
-"University of Toronto Saint George","CA","On","Toronto","http://www.utoronto.ca/"
-"Univeristy of Colorado","US","CO","Colorado Springs","http://www.uccs.edu"
 "Crooms Academy of Information Technology","US","FL","Sanford","http://www.cait.scps.k12.fl.us/"
-"University of Tasmania","AU","Tas","Hobart","http://www.utas.edu.au"
+"University of Tasmania","AU","TAS","Hobart","http://www.utas.edu.au"
 "Centralia High School","US","IL","Centralia","http://www.centraliahs.org"
 "Kent Lake High School","US","WA","Kent","http://www.kent.k12.wa.us/KSD/KL/"
 "Xavier College Preparatory","US","AZ","Phoenix","http://www.xcp.org"
 "Northeast High School","US","LA","Zachary",""
 "Morgan State University","US","MD","Baltimore","http://www.morgan.edu"
-"Quesnel Secondary School","CA","Bc","Quesnel","http://www.qss.sd28.bc.ca/"
+"Quesnel Secondary School","CA","BC","Quesnel","http://www.qss.sd28.bc.ca/"
 "Hampden-Sydney College","US","VA","Farmville","http://www.hsc.edu"
 "Minot High School","US","ND","Minot",""
-"Caddo Parish Magnet High School","US","LA","Shreveport",""
-"University of Missouri","US","MO","Rolla","http://umr.edu"
 "Midview High School","US","OH","Grafton",""
-"Florida State University School","US","FL","Tallahassee","http://fsus.fsu.edu/"
 "Manchester High School West","US","NH","Manchester","http://www.westhighschool.org/"
 "North Fort Myers High School","US","FL","North Fort Myers",""
 "Black Hawk College","US","IL","Moline","http://www.bhc.edu"
-"Bishop Carroll High School","CA","Ab","Calgary","http://www.bchs.calgary.ab.ca/"
+"Bishop Carroll High School","CA","AB","Calgary","http://www.bchs.calgary.ab.ca/"
 "University of Vermont","US","VT","Burlington","http://www.uvm.edu"
-"Council Rock High School","US","PA","Newtown","http://hsnorth.crsd.org/"
 "Livermore High School","US","CA","Livermore",""
 "Muskego High School","US","WI","Muskego",""
-"University of Maryland","US","MD","College Park","http://www.umd.edu"
 "Shawnee Mission East High School","US","KS","Prairie Village",""
-"North Idaho College","US","ID","Coeur D'alene",""
+"North Idaho College","US","ID","Coeur d'Alene",""
 "Park Ridge High School","US","NJ","Park Ridge",""
 "Briarcliff High School","US","NY","Briarcliff Manor","http://www.briarcliffschools.org"
 "Bishop Connolly High School","US","MA","Fall River","http://www.bishopconnolly.com"
 "Ipswich High School","US","MA","Ipswich","http://www.ipswichschools.org/"
 "Laguna College of Art and Design","US","CA","Laguna Beach",""
 "Tiffin Columbian High School","US","OH","Tiffin",""
-"Universität","DE","","Bremen","http://www.uni-bremen.de"
 "New Milford High School","US","NJ","New Milford","http://www.newmilfordschools.org"
 "Eastern Technical High School","US","MD","Baltimore","http://www.easttech.org"
 "Temple City High School","US","CA","Temple City",""
 "Richard Montgomery High School","US","MD","Rockville","http://www.portalcontrol.com/rmhs"
 "Granite Hills High School","US","CA","El Cajon","http://granite.guhsd.net/GHHS/home.htm"
-"North Mecklenburg High School","US","NC","Huntersville",""
+"North Mecklenburg High School","US","NC","Huntersville","http://www.cms.k12.nc.us/allschools/north/Default.html"
 "Great Oak High School","US","CA","Temecula",""
-"Evan Hardy Collegiate Institute","CA","Sk","Saskatoon","http://schools.sbe.saskatoon.sk.ca/Evanh/"
-"Université de Montréal","CA","Qc","Montréal","http://www.umontreal.ca"
+"Evan Hardy Collegiate Institute","CA","SK","Saskatoon","http://schools.sbe.saskatoon.sk.ca/Evanh/"
+"Université de Montréal","CA","QC","Montréal","http://www.umontreal.ca"
 "Deerfield Beach High School","US","FL","Deerfield Beach","http://www.deerfieldbeachhighschool.com/"
 "Rochester Institute of Technology","US","NY","Henrietta","http://www.rit.edu/"
 "Rochester Adams High School","US","MI","Rochester Hills",""
@@ -570,64 +509,52 @@
 "Antioch University","US","WA","Seattle",""
 "Webster Thomas High School","US","NY","Webster",""
 "Zeeland High School","US","MI","Zeeland",""
-"Macomb Community College","US","MI","Warren",""
-"London School of Economics and Political Science","UK","","London","http://www.lse.ac.uk"
 "Euclid High School","US","OH","Euclid",""
 "Notre Dame High School","US","TN","Chattanooga","http://www.myndhs.com"
 "State University of West Georgia","US","GA","Carrollton","http://www.westga.edu"
 "Tennessee High School","US","TN","Bristol","http://www.btcs.org/ths/"
 "Lynbrook High School","US","CA","San Jose","http://www.lhs.fuhsd.org/home/"
-"Springs Christian Academy","CA","Mb","Winnipeg",""
-"Tucson Magnet High School","US","AZ","Tucson",""
-"Springfield Collegiate Institute","CA","Mb","Oakbank","http://www.sunrisesd.ca/index.asp?sec=1277"
-"Ursula Franklin Academy","CA","On","Toronto",""
+"Springs Christian Academy","CA","MB","Winnipeg",""
+"Springfield Collegiate Institute","CA","MB","Oakbank","http://www.sunrisesd.ca/index.asp?sec=1277"
 "Foothill Technology High School","US","CA","Ventura","http://www.ventura.k12.ca.us/vusd/foothill.htm"
 "Bainbridge Island High School","US","WA","Bainbridge Island",""
 "Powell Valley High School","US","VA","Big Stone Gap","http://www.pvonline.org"
 "Somerset Community College","US","KY","Somerset",""
 "Harnett Central High School","US","NC","Angier",""
-"Chippewa Valley","US","MI","Clinton Township",""
+"Chippewa Valley","US","MI","Clinton",""
 "Alverno College","US","WI","Milwaukee","http://www.alverno.edu"
 "Cornerstone University","US","MI","Grand Rapids",""
 "Hopkins High School","US","MN","Minnetonka",""
-"South Miami High School","US","FL","Miami","http://smsh.dadeschools.net/"
 "Hamden Hall Country Day School","US","CT","Hamden","http://www.hamdenhall.org"
-"Seneca College","CA","On","Toronto","http://www.senecac.on.ca"
 "Richland High School","US","WA","Richland",""
 "Everett High School","US","MI","Lansing",""
 "E. B. Erwin High School","US","AL","Birmingham","http://webpages.charter.net/erwin/"
 "Ramapo High School","US","NJ","Franklin Lakes","http://www.rih.org/ramapo/"
-"Townsville State High School","AU","Qld","Townsville","http://townsvilleshs.eq.edu.au/"
+"Townsville State High School","AU","QLD","Townsville","http://townsvilleshs.eq.edu.au/"
 "Quince Orchard High School","US","MD","Gaithersburg","http://www.qohs.org"
 "Mount Miguel High School","US","CA","Spring Valley","http://mmhs.guhsd.net/"
 "Enfield High School","US","CT","Enfield","http://www.enfieldschools.org/our_schools/enfield_high"
 "East Hartford High School","US","CT","East Hartford",""
 "St. Joseph's High School","US","NJ","Metuchen",""
-"California State University","US","CA","Northridge",""
+"California State University - Northridge","US","CA","Northridge",""
 "Jasper High School","US","TX","Plano","http://k-12.pisd.edu/schools/jasper/index.htm"
 "North Allegheny High School","US","PA","Wexford","http://www.northallegheny.org/schools/nash/nashhome.htm"
 "Hatboro-Horsham High School","US","PA","Horsham","http://www.hatboro-horsham.org"
-"Innisdale Secondary School","CA","On","Barrie",""
-"California Polytechnic University","US","CA","San Luis Obispo",""
+"Innisdale Secondary School","CA","ON","Barrie",""
 "Freehold High School","US","NJ","Freehold","http://www.frhsd.com/FREEHOLD_HS/"
-"Massachusetts Academy of Math and Science at Wpi","US","MA","Worcester","http://www.massacademy.org"
 "Concordia University","US","TX","Austin","http://www.concordia.edu"
-"Stockholms Universitet","SE","","Stockholm","http://www.su.se"
 "Gulf Coast High School","US","FL","Naples",""
 "Eckerd College","US","FL","St. Petersburg","http://www.eckerd.edu"
 "Cleveland State University","US","OH","Cleveland","http://www.csuohio.edu"
-"Daramalan College","AU","Act","Canberra","http://www.daramalanc.act.edu.au/"
-"Nathaniel Narbonne High School","US","CA","Harbor City",""
-"Jean Nicolet High School","US","WI","Glendale",""
+"Daramalan College","AU","ACT","North Canberra","http://www.daramalanc.act.edu.au/"
+"Nathaniel Narbonne High School","US","CA","Harbor City","http://www.narbonnehigh.org/"
 "Skagit Valley College","US","WA","Mount Vernon","http://www.skagit.edu/"
 "Mansfield High School","US","TX","Mansfield","http://www.mansfieldisd.org/mhs/"
-"University of Manitoba","CA","Mb","Winnipeg","http://www.umanitoba.ca"
+"University of Manitoba","CA","MB","Winnipeg","http://www.umanitoba.ca"
 "Olathe North High School","US","KS","Olathe",""
 "Heidelberg College","US","OH","Tiffin","http://www.heidelberg.edu"
 "Chapman University","US","CA","Orange","http://www.chapman.edu/"
 "Independence High School","US","AZ","Glendale","http://independence.guhsdaz.org/"
-"Cony Free High School","US","ME","Augusta",""
-"Douglas Southall Freeman High School","US","VA","Richmond","http://www.henrico.k12.va.us/HS/Freeman/"
 "Dunellen High School","US","NJ","Dunellen",""
 "Nova Alternative High School","US","WA","Seattle","http://www.novaproj.org/"
 "Kansas Wesleyan University","US","KS","Salina","http://www.kwu.edu"
@@ -639,50 +566,44 @@
 "Marquette High School","US","MO","Chesterfield","http://www.rockwood.k12.mo.us/marquette/"
 "Butler Area Intermediate High School","US","PA","Butler","http://www.butler.k12.pa.us/schools/ihs/index.html"
 "Montevallo High School","US","AL","Montevallo",""
-"Queensborough Community College","US","NY","Bayside","http://www.qcc.cuny.edu"
 "Lee High School","US","AL","Huntsville",""
 "Churchill High School","US","OR","Eugene",""
-"Sheffield High School for Girls","UK","","Sheffield",""
+"Sheffield High School for Girls","UK","England - South Yorkshire","Sheffield",""
 "Parkway West High School","US","MO","Chesterfield",""
-"Wilcox High School","US","CA","Santa Clara",""
-"University of Arkansas","US","AR","Fort Smith","http://www.uafortsmith.edu/"
-"Pierce Community College","US","WA","Lakewood","http://w...
 (truncated)
Tags: dat, gariev, livejournal, sql
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments