Commit ea7b7a5a authored by Guillaume Mella's avatar Guillaume Mella
Browse files

remove com column

parent f392a448
...@@ -38,7 +38,6 @@ def upgrade(): ...@@ -38,7 +38,6 @@ def upgrade():
sa.Column('band_code', sa.Integer(), nullable=True), sa.Column('band_code', sa.Integer(), nullable=True),
sa.Column('notes', sa.String(length=255), nullable=True), sa.Column('notes', sa.String(length=255), nullable=True),
sa.Column('bibcode', sa.String(length=19), nullable=True), sa.Column('bibcode', sa.String(length=19), nullable=True),
sa.Column('com', sa.String(length=255), nullable=True),
sa.PrimaryKeyConstraint('id', name=op.f('pk_star_info')) sa.PrimaryKeyConstraint('id', name=op.f('pk_star_info'))
) )
op.create_table('submission', op.create_table('submission',
......
...@@ -79,7 +79,6 @@ class StarInfo(Base): ...@@ -79,7 +79,6 @@ class StarInfo(Base):
'BANDCODE': { 'field': 'band_code', 'must': False, 'check': 'check_band_code' }, 'BANDCODE': { 'field': 'band_code', 'must': False, 'check': 'check_band_code' },
'NOTES': { 'field': 'notes', 'must': False }, 'NOTES': { 'field': 'notes', 'must': False },
'BIBCODE': { 'field': 'bibcode', 'must': True, 'check': 'check_bibcode', 'alternate': 'REFERENCE'}, 'BIBCODE': { 'field': 'bibcode', 'must': True, 'check': 'check_bibcode', 'alternate': 'REFERENCE'},
'COM': { 'field': 'com', 'must': False, 'alternate': 'REFERENCE'},
'REFERENCE': { 'must': False, 'parse': 'parse_reference' }, 'REFERENCE': { 'must': False, 'parse': 'parse_reference' },
'SINPE': {'field': 'sinpe', 'must': False, 'check': 'check_bool', 'parse': 'parse_sinpe'}, # SIMBAD Id Not Precise Enough 'SINPE': {'field': 'sinpe', 'must': False, 'check': 'check_bool', 'parse': 'parse_sinpe'}, # SIMBAD Id Not Precise Enough
}, },
...@@ -130,7 +129,6 @@ class StarInfo(Base): ...@@ -130,7 +129,6 @@ class StarInfo(Base):
band_code = Column(Integer) band_code = Column(Integer)
notes = Column(String(255)) notes = Column(String(255))
bibcode = Column(String(19)) bibcode = Column(String(19))
com = Column(String(255))
sinpe = Column(Boolean) sinpe = Column(Boolean)
star_info_entry = relationship('StarInfoEntry', back_populates='star_info') star_info_entry = relationship('StarInfoEntry', back_populates='star_info')
...@@ -421,7 +419,7 @@ class StarInfo(Base): ...@@ -421,7 +419,7 @@ class StarInfo(Base):
self.append_warning(field_name, "bibcode portion is incompletely specified") self.append_warning(field_name, "bibcode portion is incompletely specified")
self.set_field_value('bibcode', bibcode) self.set_field_value('bibcode', bibcode)
if comment: if comment:
self.set_field_value('com', comment) self.append_warning('bibcode', 'bibcode extract ignore next part : %s'%comment)
# force parsing before checking since starname check depends on this field # force parsing before checking since starname check depends on this field
def parse_sinpe(self, field_name, field_info, value): def parse_sinpe(self, field_name, field_info, value):
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
<th>BAND_CODE</th> <th>BAND_CODE</th>
<th>NOTES</th> <th>NOTES</th>
<th>BIBCODE</th> <th>BIBCODE</th>
<th>COM</th>
<th>SINPE</th> <th>SINPE</th>
</tr> </tr>
</thead> </thead>
...@@ -41,7 +40,6 @@ ...@@ -41,7 +40,6 @@
<td>{{ entry.star_info.band_code or '' }}</td> <td>{{ entry.star_info.band_code or '' }}</td>
<td>{{ entry.star_info.notes or '' }}</td> <td>{{ entry.star_info.notes or '' }}</td>
<td><a href="https://ui.adsabs.harvard.edu/abs/{{ entry.star_info.bibcode or '' }}/abstract">{{ entry.star_info.bibcode or '' }}</a></td> <td><a href="https://ui.adsabs.harvard.edu/abs/{{ entry.star_info.bibcode or '' }}/abstract">{{ entry.star_info.bibcode or '' }}</a></td>
<td>{{ entry.star_info.com or '' }}</td>
<td>{{ entry.star_info.sinpe or '' }}</td> <td>{{ entry.star_info.sinpe or '' }}</td>
</tr> </tr>
<tr> <tr>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment