dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f85c300
)
Program result should be lower than 256.
author
Peter Verthez
<Peter.Verthez@advalvas.be>
Sun, 12 Jan 2003 08:48:53 +0000
(08:48 +0000)
committer
Peter Verthez
<Peter.Verthez@advalvas.be>
Sun, 12 Jan 2003 08:48:53 +0000
(08:48 +0000)
t/src/update_gom.c
patch
|
blob
|
history
diff --git
a/t/src/update_gom.c
b/t/src/update_gom.c
index 93224c68aa0806edaaf70c24fcc1ea9c7ba20144..46a990740f3a81d5be6f7ddd782ddcc014c1f647 100644
(file)
--- a/
t/src/update_gom.c
+++ b/
t/src/update_gom.c
@@
-137,63
+137,63
@@
int test_date_functions()
head = gom_get_header();
if (head == NULL)
head = gom_get_header();
if (head == NULL)
- return
10
0;
+ return
5
0;
dv = head->date;
if (dv != NULL)
dv = head->date;
if (dv != NULL)
- return
10
1;
+ return
5
1;
dv = gedcom_new_date_value(NULL);
if (dv == NULL)
dv = gedcom_new_date_value(NULL);
if (dv == NULL)
- return
10
2;
+ return
5
2;
head->date = dv;
date_str = print_date("Initial date value", dv);
if (date_str[0])
head->date = dv;
date_str = print_date("Initial date value", dv);
if (date_str[0])
- return
10
3;
+ return
5
3;
dv->date1.cal = CAL_GREGORIAN;
strcpy(dv->date1.year_str, "1990");
normalized = gedcom_normalize_date(DI_FROM_STRINGS, dv);
if (normalized != 0)
dv->date1.cal = CAL_GREGORIAN;
strcpy(dv->date1.year_str, "1990");
normalized = gedcom_normalize_date(DI_FROM_STRINGS, dv);
if (normalized != 0)
- return
10
4;
+ return
5
4;
date_str = print_date("Setting only year string", dv);
if (! date_str[0])
date_str = print_date("Setting only year string", dv);
if (! date_str[0])
- return
10
5;
+ return
5
5;
dv->date1.year = 1989;
normalized = gedcom_normalize_date(DI_FROM_NUMBERS, dv);
if (normalized != 0)
dv->date1.year = 1989;
normalized = gedcom_normalize_date(DI_FROM_NUMBERS, dv);
if (normalized != 0)
- return
10
6;
+ return
5
6;
date_str = print_date("Setting only year number", dv);
if (! date_str[0])
date_str = print_date("Setting only year number", dv);
if (! date_str[0])
- return
10
7;
+ return
5
7;
dv->date1.type = DATE_EXACT;
dv->date1.sdn1 = 2500000;
dv->date1.sdn2 = -1;
normalized = gedcom_normalize_date(DI_FROM_SDN, dv);
if (normalized != 0)
dv->date1.type = DATE_EXACT;
dv->date1.sdn1 = 2500000;
dv->date1.sdn2 = -1;
normalized = gedcom_normalize_date(DI_FROM_SDN, dv);
if (normalized != 0)
- return
10
8;
+ return
5
8;
date_str = print_date("Setting only SDN 1", dv);
if (! date_str[0])
date_str = print_date("Setting only SDN 1", dv);
if (! date_str[0])
- return
10
9;
+ return
5
9;
dv->date1.cal = CAL_HEBREW;
normalized = gedcom_normalize_date(DI_FROM_SDN, dv);
if (normalized != 0)
dv->date1.cal = CAL_HEBREW;
normalized = gedcom_normalize_date(DI_FROM_SDN, dv);
if (normalized != 0)
- return
11
0;
+ return
6
0;
date_str = print_date("Same date in Hebrew calendar", dv);
if (! date_str[0])
date_str = print_date("Same date in Hebrew calendar", dv);
if (! date_str[0])
- return
11
1;
+ return
6
1;
dv->date1.cal = CAL_FRENCH_REV;
normalized = gedcom_normalize_date(DI_FROM_SDN, dv);
if (normalized == 0)
dv->date1.cal = CAL_FRENCH_REV;
normalized = gedcom_normalize_date(DI_FROM_SDN, dv);
if (normalized == 0)
- return
11
2;
+ return
6
2;
date_str = print_date("Same date in French revolution calendar", dv);
if (date_str[0])
date_str = print_date("Same date in French revolution calendar", dv);
if (date_str[0])
- return
11
3;
+ return
6
3;
dv->date1.cal = CAL_GREGORIAN;
dv->date1.day = 4;
dv->date1.cal = CAL_GREGORIAN;
dv->date1.day = 4;
@@
-201,14
+201,14
@@
int test_date_functions()
dv->date1.year = 1799;
normalized = gedcom_normalize_date(DI_FROM_NUMBERS, dv);
if (normalized != 0)
dv->date1.year = 1799;
normalized = gedcom_normalize_date(DI_FROM_NUMBERS, dv);
if (normalized != 0)
- return
11
4;
+ return
6
4;
dv->date1.cal = CAL_FRENCH_REV;
normalized = gedcom_normalize_date(DI_FROM_SDN, dv);
if (normalized != 0)
dv->date1.cal = CAL_FRENCH_REV;
normalized = gedcom_normalize_date(DI_FROM_SDN, dv);
if (normalized != 0)
- return
11
5;
+ return
6
5;
date_str = print_date("Valid French revolution date", dv);
if (! date_str[0])
date_str = print_date("Valid French revolution date", dv);
if (! date_str[0])
- return
11
6;
+ return
6
6;
return 0;
}
return 0;
}
@@
-232,115
+232,118
@@
int test_record_add_delete_functions()
const char* note_text = "This is some text";
fam1 = gom_add_family("@FAM1@");
const char* note_text = "This is some text";
fam1 = gom_add_family("@FAM1@");
- if (!fam1) return
2
01;
+ if (!fam1) return
1
01;
value = gom_set_string(&fam1->nr_of_children, new_nr_of_children);
if (value == NULL)
value = gom_set_string(&fam1->nr_of_children, new_nr_of_children);
if (value == NULL)
- return
2
02;
+ return
1
02;
if (strcmp(value, new_nr_of_children))
if (strcmp(value, new_nr_of_children))
- return
2
03;
+ return
1
03;
ind1 = gom_add_individual("@FAM1@");
ind1 = gom_add_individual("@FAM1@");
- if (ind1) return
2
04;
+ if (ind1) return
1
04;
ind1 = gom_add_individual("@IND1@");
ind1 = gom_add_individual("@IND1@");
- if (!ind1) return
2
05;
+ if (!ind1) return
1
05;
mm1 = gom_add_multimedia("@OBJ1@");
mm1 = gom_add_multimedia("@OBJ1@");
- if (!mm1) return
2
06;
+ if (!mm1) return
1
06;
note1 = gom_add_note("@NOTE1@");
note1 = gom_add_note("@NOTE1@");
- if (!note1) return
2
07;
+ if (!note1) return
1
07;
value = gom_set_string(¬e1->text, note_text);
if (value == NULL)
value = gom_set_string(¬e1->text, note_text);
if (value == NULL)
- return
2
08;
+ return
1
08;
if (strcmp(value, note_text))
if (strcmp(value, note_text))
- return
2
09;
+ return
1
09;
repo1 = gom_add_repository("@REPO1@");
repo1 = gom_add_repository("@REPO1@");
- if (!repo1) return
2
10;
+ if (!repo1) return
1
10;
sour1 = gom_add_source("@SOUR1@");
sour1 = gom_add_source("@SOUR1@");
- if (!sour1) return
2
11;
+ if (!sour1) return
1
11;
subm2 = gom_add_submitter("@SUBMITTER@");
subm2 = gom_add_submitter("@SUBMITTER@");
- if (subm2) return
2
12;
+ if (subm2) return
1
12;
subm2 = gom_add_submitter("@SUBM2@");
subm2 = gom_add_submitter("@SUBM2@");
- if (!subm2) return
2
13;
+ if (!subm2) return
1
13;
subn1 = gom_add_submission("@SUBMISSION@");
subn1 = gom_add_submission("@SUBMISSION@");
- if (!subn1) return
2
14;
+ if (!subn1) return
1
14;
user1 = gom_add_user_rec("@USER1@", "WRTAG");
user1 = gom_add_user_rec("@USER1@", "WRTAG");
- if (user1) return
2
15;
+ if (user1) return
1
15;
user1 = gom_add_user_rec("@USER1@", "_TAG");
user1 = gom_add_user_rec("@USER1@", "_TAG");
- if (!user1) return
2
16;
+ if (!user1) return
1
16;
xr = gom_set_xref(&(fam1->husband), ind1->xrefstr);
xr = gom_set_xref(&(fam1->husband), ind1->xrefstr);
- if (!xr) return
2
18;
+ if (!xr) return
1
18;
ind2 = gom_add_individual("@IND2@");
ind2 = gom_add_individual("@IND2@");
- if (!ind2) return
2
19;
+ if (!ind2) return
1
19;
ind3 = gom_add_individual("@IND3@");
ind3 = gom_add_individual("@IND3@");
- if (!ind3) return
2
20;
+ if (!ind3) return
1
20;
ind4 = gom_add_individual("@IND4@");
ind4 = gom_add_individual("@IND4@");
- if (!ind4) return
2
21;
+ if (!ind4) return
1
21;
xrl = gom_add_xref(&(fam1->children), ind2->xrefstr);
xrl = gom_add_xref(&(fam1->children), ind2->xrefstr);
- if (!xrl) return
2
22;
+ if (!xrl) return
1
22;
xrl = gom_add_xref(&(fam1->children), ind3->xrefstr);
xrl = gom_add_xref(&(fam1->children), ind3->xrefstr);
- if (!xrl) return
2
23;
+ if (!xrl) return
1
23;
xrl = gom_add_xref(&(fam1->children), ind4->xrefstr);
xrl = gom_add_xref(&(fam1->children), ind4->xrefstr);
- if (!xrl) return
2
24;
+ if (!xrl) return
1
24;
result = gom_remove_xref(&(fam1->children), ind3->xrefstr);
result = gom_remove_xref(&(fam1->children), ind3->xrefstr);
- if (result != 0) return
2
25;
+ if (result != 0) return
1
25;
result = gom_remove_xref(&(fam1->children), ind4->xrefstr);
result = gom_remove_xref(&(fam1->children), ind4->xrefstr);
- if (result != 0) return
2
26;
+ if (result != 0) return
1
26;
output(1, "Intermediate output:\n");
show_data();
result = gom_delete_individual(ind1);
output(1, "Intermediate output:\n");
show_data();
result = gom_delete_individual(ind1);
- if (result == 0) return
251
;
+ if (result == 0) return
150
;
xr = gom_set_xref(&(fam1->husband), NULL);
xr = gom_set_xref(&(fam1->husband), NULL);
- if (xr) return
252
;
+ if (xr) return
151
;
result = gom_delete_individual(ind1);
result = gom_delete_individual(ind1);
- if (result != 0) return
253
;
+ if (result != 0) return
152
;
result = gom_delete_family(fam1);
result = gom_delete_family(fam1);
- if (result != 0) return 250;
+ if (result != 0) return 153;
+
+ result = gom_delete_individual(ind2);
+ if (result != 0) return 154;
result = gom_delete_multimedia(mm1);
result = gom_delete_multimedia(mm1);
- if (result != 0) return
254
;
+ if (result != 0) return
155
;
result = gom_delete_note(note1);
result = gom_delete_note(note1);
- if (result != 0) return
255
;
+ if (result != 0) return
156
;
result = gom_delete_repository(repo1);
result = gom_delete_repository(repo1);
- if (result != 0) return
256
;
+ if (result != 0) return
157
;
result = gom_delete_source(sour1);
result = gom_delete_source(sour1);
- if (result != 0) return
257
;
+ if (result != 0) return
158
;
result = gom_delete_submitter(subm2);
result = gom_delete_submitter(subm2);
- if (result != 0) return
258
;
+ if (result != 0) return
159
;
result = gom_delete_submission(subn1);
result = gom_delete_submission(subn1);
- if (result != 0) return
259
;
+ if (result != 0) return
160
;
result = gom_delete_user_rec(user1);
result = gom_delete_user_rec(user1);
- if (result != 0) return
260
;
+ if (result != 0) return
161
;
return 0;
}
return 0;
}