aboutsummaryrefslogtreecommitdiff
path: root/src/io/output.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/io/output.c')
-rw-r--r--src/io/output.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/io/output.c b/src/io/output.c
index 0913f04..5f9bb3e 100644
--- a/src/io/output.c
+++ b/src/io/output.c
@@ -121,19 +121,16 @@ static JSON_Value *output_jjson(curve_t *curve) {
json_object_set_value(root_object, "subgroups", gens_value);
}
if (cfg->metadata) {
- debug_log("here");
if (curve->meta.j_invariant != NULL) {
char *j = pari_sprintf("%Pi", curve->meta.j_invariant);
json_object_dotset_string(root_object, "meta.j", j);
pari_free(j);
}
- debug_log("here");
if (curve->meta.discriminant != NULL) {
char *disc = pari_sprintf("%Pi", curve->meta.discriminant);
json_object_dotset_string(root_object, "meta.discriminant", disc);
pari_free(disc);
}
- debug_log("here");
if (curve->meta.embedding_degree != NULL) {
char *embedding_degree =
pari_sprintf("%Pi", curve->meta.embedding_degree);
@@ -141,13 +138,11 @@ static JSON_Value *output_jjson(curve_t *curve) {
embedding_degree);
pari_free(embedding_degree);
}
- debug_log("here");
if (curve->meta.frobenius_trace != NULL) {
char *frobenius = pari_sprintf("%Pi", curve->meta.frobenius_trace);
json_object_dotset_string(root_object, "meta.frobenius", frobenius);
pari_free(frobenius);
}
- debug_log("here");
if (curve->meta.cm_discriminant != NULL) {
char *cm_discriminant =
pari_sprintf("%Pi", curve->meta.cm_discriminant);
@@ -155,7 +150,12 @@ static JSON_Value *output_jjson(curve_t *curve) {
cm_discriminant);
pari_free(cm_discriminant);
}
- debug_log("here");
+ if (curve->meta.conductor != NULL) {
+ char *conductor = pari_sprintf("%Pi", curve->meta.conductor);
+ json_object_dotset_string(root_object, "meta.conductor",
+ conductor);
+ pari_free(conductor);
+ }
}
avma = ltop;