Skip to content

Commit

Permalink
Commit everything that had been added before
Browse files Browse the repository at this point in the history
I don't usually do this.
  • Loading branch information
Ian Fisher committed Sep 18, 2017
1 parent e3ea2eb commit 9e9e996
Show file tree
Hide file tree
Showing 29 changed files with 9,226 additions and 424 deletions.
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#Files to ignore #
*~
*.pyc
settings.py
.DS_STORE
settings_secret.py
.DS_Store
static/img
*.swp
22 changes: 22 additions & 0 deletions QI/management/commands/2new_XML_to_HTML.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import xml.etree.ElementTree as ET
import os
import re
import csv
from lxml import etree
import lxml.etree as ET
from html5lib.sanitizer import HTMLSanitizerMixin
from bs4 import BeautifulSoup
from QI.models import Manuscript,Page
from HTMLParser import HTMLParser
from html import HTML

def xml_to_html(xml_file):
django_tag_open = []
page_html = HTML()
class MyHTMLPaser(HTMLParser):
def handle_starttag(self,tag,attrs):
if tag == "persName":
django_tag_open.append("persName")
page_html.a(
#would need to know stuff, maybe can still make work, but ehhh

12 changes: 6 additions & 6 deletions QI/management/commands/new_XML_to_HTML.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def xml_to_html(xml_file):

root = etree.fromstring(new_xml_string)
#print etree.tostring(root)

print 'here 1'
for persName in root.iter("persName"):
if len(persName.items()) != 0:
persName.attrib["key"] = "#"+persName.items()[0][1]
Expand Down Expand Up @@ -86,7 +86,7 @@ def xml_to_html(xml_file):
if tag not in HTMLSanitizerMixin.acceptable_elements and tag != "body" and tag != "pb" :
etree.strip_tags(root, tag) #takes out tags that are not html tags from xml (changing to html) file


print 'here 2'

#print etree.tostring(root)
html_string = etree.tostring(root)
Expand All @@ -112,7 +112,7 @@ def xml_to_html(xml_file):
new_pb_list.append(ele)

for_csv = ''.join(html_string)

print 'here 3'
#don't want this
'''
with open("csv_for_"+os.path.basename(xml_file)+".csv", 'wb') as f:
Expand Down Expand Up @@ -147,7 +147,7 @@ def xml_to_html(xml_file):
print "DAMN IT, this has the problem"
has_annoying_problem=True


print 'here 4'
#a=soup.div.unwrap()
#print a
#return a
Expand Down Expand Up @@ -282,10 +282,10 @@ def xml_to_html(xml_file):
else:
html = html + saved + char
saved = ""
print "HTML: " ,html
#print "HTML: " ,html
html_list.append(html)
#print html_list

print 'here 5'
"""
'''
print "here is my soup"
Expand Down
209 changes: 209 additions & 0 deletions QI/migrations/0030_auto_20161222_1542.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('QI', '0029_place_place_type'),
]

operations = [
migrations.AddField(
model_name='manuscript',
name='location',
field=models.CharField(max_length=20, verbose_name=b'Location', blank=True),
),
migrations.AddField(
model_name='manuscript',
name='org_id',
field=models.ForeignKey(related_name='org_id_text', blank=True, to='QI.Org', null=True),
),
migrations.AddField(
model_name='manuscript',
name='org_name',
field=models.CharField(max_length=200, verbose_name=b'Organization', blank=True),
),
migrations.AddField(
model_name='manuscript',
name='person_name',
field=models.CharField(max_length=100, verbose_name=b'Author', blank=True),
),
migrations.AddField(
model_name='manuscript',
name='summary',
field=models.CharField(max_length=1000, verbose_name=b'summary', blank=True),
),
migrations.AlterField(
model_name='manuscript',
name='date',
field=models.CharField(max_length=50, verbose_name=b'Date', blank=True),
),
migrations.AlterField(
model_name='manuscript',
name='id_tei',
field=models.CharField(max_length=100, verbose_name=b'TEI ID'),
),
migrations.AlterField(
model_name='manuscript',
name='title',
field=models.CharField(max_length=300, verbose_name=b'Title', blank=True),
),
migrations.AlterField(
model_name='org',
name='PYM_index',
field=models.TextField(max_length=500, verbose_name=b'PYM Index', blank=True),
),
migrations.AlterField(
model_name='org',
name='associated_spellings',
field=models.TextField(max_length=500, verbose_name=b'Associated Spellings/Names', blank=True),
),
migrations.AlterField(
model_name='org',
name='bio_notes',
field=models.TextField(max_length=500, verbose_name=b'Description Field', blank=True),
),
migrations.AlterField(
model_name='org',
name='citations',
field=models.TextField(max_length=500, verbose_name=b'Description Field', blank=True),
),
migrations.AlterField(
model_name='org',
name='data_notes',
field=models.CharField(max_length=500, verbose_name=b'LCNAF URI', blank=True),
),
migrations.AlterField(
model_name='org',
name='date_dissolved',
field=models.CharField(max_length=500, verbose_name=b'Date Founded', blank=True),
),
migrations.AlterField(
model_name='org',
name='date_founded',
field=models.CharField(max_length=500, verbose_name=b'Date Founded', blank=True),
),
migrations.AlterField(
model_name='org',
name='id_tei',
field=models.CharField(max_length=500, verbose_name=b'TEI ID'),
),
migrations.AlterField(
model_name='org',
name='lcnaf_uri',
field=models.CharField(max_length=500, verbose_name=b'LCNAF URI', blank=True),
),
migrations.AlterField(
model_name='org',
name='notes',
field=models.CharField(max_length=500, verbose_name=b'Notes', blank=True),
),
migrations.AlterField(
model_name='org',
name='organization_name',
field=models.CharField(max_length=500, verbose_name=b'Name of Organization', blank=True),
),
migrations.AlterField(
model_name='org',
name='other_names',
field=models.CharField(max_length=500, verbose_name=b'Other Names of Organization', blank=True),
),
migrations.AlterField(
model_name='person',
name='PYM_index',
field=models.TextField(max_length=100, verbose_name=b'PYM Index', blank=True),
),
migrations.AlterField(
model_name='person',
name='bio_notes',
field=models.TextField(max_length=100, verbose_name=b'Biography Note Field', blank=True),
),
migrations.AlterField(
model_name='person',
name='birth_date',
field=models.CharField(max_length=100, verbose_name=b'Birth Date', blank=True),
),
migrations.AlterField(
model_name='person',
name='citations',
field=models.TextField(max_length=100, verbose_name=b'Citations', blank=True),
),
migrations.AlterField(
model_name='person',
name='data_notes',
field=models.TextField(max_length=100, verbose_name=b'Data Note Field', blank=True),
),
migrations.AlterField(
model_name='person',
name='death_date',
field=models.CharField(max_length=100, verbose_name=b'Death Date', blank=True),
),
migrations.AlterField(
model_name='person',
name='id_tei',
field=models.CharField(max_length=100, verbose_name=b'TEI ID'),
),
migrations.AlterField(
model_name='person',
name='lcnaf_uri',
field=models.CharField(max_length=100, verbose_name=b'URI LCNAF', blank=True),
),
migrations.AlterField(
model_name='person',
name='notes',
field=models.TextField(max_length=100, verbose_name=b'Note Field', blank=True),
),
migrations.AlterField(
model_name='person',
name='other_names',
field=models.TextField(max_length=100, verbose_name=b'Other Names', blank=True),
),
migrations.AlterField(
model_name='person',
name='review_status',
field=models.CharField(max_length=100, verbose_name=b'TEI ID'),
),
migrations.AlterField(
model_name='place',
name='alternate',
field=models.TextField(max_length=200, verbose_name=b'Alternate Names', blank=True),
),
migrations.AlterField(
model_name='place',
name='date',
field=models.CharField(max_length=100, verbose_name=b'Date', blank=True),
),
migrations.AlterField(
model_name='place',
name='id_tei',
field=models.CharField(max_length=100, verbose_name=b'TEI ID'),
),
migrations.AlterField(
model_name='place',
name='latitude',
field=models.CharField(max_length=100, null=True, verbose_name=b'Latitude', blank=True),
),
migrations.AlterField(
model_name='place',
name='longitude',
field=models.CharField(max_length=100, null=True, verbose_name=b'Longitude', blank=True),
),
migrations.AlterField(
model_name='place',
name='notes',
field=models.TextField(max_length=500, verbose_name=b'Description Field', blank=True),
),
migrations.AlterField(
model_name='place',
name='notes2',
field=models.TextField(max_length=500, verbose_name=b'Description Field', blank=True),
),
migrations.AlterField(
model_name='place',
name='state',
field=models.CharField(max_length=100, verbose_name=b'State', blank=True),
),
]
2 changes: 1 addition & 1 deletion manage.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/srv/QI_env/bin/python
import os
import sys

Expand Down
2 changes: 2 additions & 0 deletions static/AutoModels/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.xml
*.html
Loading

0 comments on commit 9e9e996

Please sign in to comment.