Skip to content

Commit 25d73b4

Browse files
tychonievichtychonievich
committed
finish MVP
1 parent 329d425 commit 25d73b4

13 files changed

Lines changed: 11920 additions & 15 deletions

‎README.md‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ The above will overwrite the files in `edu/virginia/ged5to7/config/` with update
3939
- [x] change age words to canonical forms (stillborn as `0y`, child as `< 8y`, infant as `< 1y`) with `PHRASE`s
4040
- [x] Normalize spacing in `AGE` payloads
4141
- [x] add missing `y`
42-
- [x] Change any illegal tag `XYZ` into `_EXT_XYZ`
43-
- [ ] or to `_XYZ` and add a SCHMA entry for it
44-
- [ ] leave unchanged under extensions
4542
- [x] change `SOUR` with text payload into pointer to `SOUR` with `NOTE`
4643
- [x] change `OBJE` with no payload to pointer to new `OBJE` record
4744
- [x] change `NOTE` record or with pointer payload into `SNOTE`
@@ -62,15 +59,17 @@ The above will overwrite the files in `edu/virginia/ged5to7/config/` with update
6259
- [x] Convert user-text to `PHRASE`s
6360
- [x] change `RFN`, `RIN`, and `AFN` to `EXID`
6461
- [x] change `_FSFTID`, `_APID` to `EXID`
65-
- [ ] Convert `MEDI`.`FORM` payloads to media types
66-
- [ ] Convert `FONE` and `ROMN` to `TRAN` and their `TYPE`s to BCP-47 `LANG`s
67-
- [ ] remove `SUBN`, `HEAD`.`FILE`, `HEAD`.`CHAR`
68-
- (deferred) `HEAD`.`PLAC` was originally on this list, but has been deferred to a later version
69-
- [ ] change `FILE` payloads into URLs
70-
- [ ] Windows-style `\` becomes `/`
71-
- [ ] Windows diver letter `C:\WINDOWS` becomes `file:///c:/WINDOWS`
72-
- [ ] POSIX-stye `/User/foo` becomes `file:///User/foo`
62+
- [x] Convert `MEDI`.`FORM` payloads to media types
63+
- [x] Convert `FONE` and `ROMN` to `TRAN` and their `TYPE`s to BCP-47 `LANG`s
64+
- [x] change `FILE` payloads into URLs
65+
- [x] Windows-style `\` becomes `/`
66+
- [x] Windows diver letter `C:\WINDOWS` becomes `file:///c:/WINDOWS`
67+
- [x] POSIX-stye `/User/foo` becomes `file:///User/foo`
68+
- [x] remove `SUBN`, `HEAD`.`FILE`, `HEAD`.`CHAR`
7369
- [x] update the `GEDC`.`VERS` to `7.0`
70+
- [x] Change any illegal tag `XYZ` into `_EXT_XYZ`
71+
- [ ] or to `_XYZ` and add a SCHMA entry for it
72+
- [ ] leave unchanged under extensions
7473
- [ ] (extra) change string-valued `INDI`.`ALIA` into `NAME` with `TYPE` `AKA`
7574
- [ ] (5.5) change base64-encoded OBJE into GEDZIP
7675
- [ ] add `SCHMA` for all used known extensions

‎edu/virginia/ged5to7/Converter5to7.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ public Converter5to7(String filename, int id_base) {
5959
new SourceFilter(),
6060
new ObjectFilter(),
6161
new LanguageFilter(),
62+
new TranFilter(),
6263
new EnumFilter(),
6364
new ExidFilter(),
65+
new FileFilter(),
66+
new MediaTypeFilter(),
6467
};
6568
for(Filter f : filters) {
6669
java.util.LinkedList<GedStruct> created = new java.util.LinkedList<GedStruct>();

‎edu/virginia/ged5to7/GedStruct.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public GedStruct(String line) {
4141
level = Integer.parseInt(m.group(1));
4242
if (m.group(2) != null) {
4343
id = m.group(2).toUpperCase();
44-
if (id == "@VOID@") throw new IllegalArgumentException("@VOID@ must not be used as a record identifier in:\n"+line);
44+
if ("@VOID@".equals(id)) throw new IllegalArgumentException("@VOID@ must not be used as a record identifier in:\n"+line);
4545
}
4646
tag = m.group(3).toUpperCase();
4747
payload = fixAtSign(m.group(4));

0 commit comments

Comments
 (0)