Skip to content

Commit 1630ab8

Browse files
If an invalid userid was passed in an input file,
an error was not written to the output file. Fixed.
1 parent c7fc915 commit 1630ab8

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

src/Changeset1.java

+14-8
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ private static void process_changesets_xml( Node root_node, String passed_displa
12051205
}
12061206
}
12071207

1208-
static void process_changesets_url_common ( URL passed_url, String passed_display_name, String passed_uid,
1208+
static void process_changesets_url_common ( URL passed_url, String passed_display_name, String passed_uid, String passed_id,
12091209
String passed_min_lat_string, String passed_min_lon_string, String passed_max_lat_string, String passed_max_lon_string,
12101210
String passed_download_changeset, String passed_building, boolean passed_overlapnodes, String passed_download_nodes ) throws Exception
12111211
{
@@ -1251,7 +1251,13 @@ static void process_changesets_url_common ( URL passed_url, String passed_displa
12511251
{
12521252
if ( arg_debug >= Log_Error )
12531253
{
1254-
System.out.println( "Error obtaining: " + passed_url + ", " + ex.getMessage() );
1254+
//qqq
1255+
System.out.println( "Error obtaining: " + passed_url );
1256+
}
1257+
1258+
if ( arg_out_file != "" )
1259+
{
1260+
myPrintStream.println( passed_display_name + ";" + passed_uid + ";" + passed_id + ";;;;0 changesets, error obtaining" );
12551261
}
12561262
}
12571263
}
@@ -1269,7 +1275,7 @@ static void process_display_name_and_time( String passed_display_name, String pa
12691275
URL url;
12701276
url = new URL( api_path + "changesets?display_name=" + ( URLEncoder.encode( passed_display_name , "UTF-8" )) + "&time=" + passed_time );
12711277

1272-
process_changesets_url_common( url, passed_display_name, "",
1278+
process_changesets_url_common( url, passed_display_name, "", "",
12731279
passed_min_lat_string, passed_min_lon_string, passed_max_lat_string, passed_max_lon_string,
12741280
passed_download_changeset, passed_building, passed_overlapnodes, passed_download_nodes );
12751281
}
@@ -1287,7 +1293,7 @@ static void process_uid_and_time( String passed_uid, String passed_time,
12871293
URL url;
12881294
url = new URL( api_path + "changesets?user=" + ( URLEncoder.encode( passed_uid , "UTF-8" )) + "&time=" + passed_time );
12891295

1290-
process_changesets_url_common( url, "", passed_uid, passed_min_lat_string,
1296+
process_changesets_url_common( url, "", passed_uid, "", passed_min_lat_string,
12911297
passed_min_lon_string, passed_max_lat_string, passed_max_lon_string,
12921298
passed_download_changeset, passed_building, passed_overlapnodes, passed_download_nodes );
12931299
}
@@ -1305,7 +1311,7 @@ static void process_display_name( String passed_display_name,
13051311
URL url;
13061312
url = new URL( api_path + "changesets?display_name=" + ( URLEncoder.encode( passed_display_name , "UTF-8" )));
13071313

1308-
process_changesets_url_common( url, passed_display_name, "",
1314+
process_changesets_url_common( url, passed_display_name, "", "",
13091315
passed_min_lat_string, passed_min_lon_string, passed_max_lat_string, passed_max_lon_string,
13101316
passed_download_changeset, passed_building, passed_overlapnodes, passed_download_nodes );
13111317
}
@@ -1323,7 +1329,7 @@ static void process_uid( String passed_uid,
13231329
URL url;
13241330
url = new URL( api_path + "changesets?user=" + ( URLEncoder.encode( passed_uid , "UTF-8" )));
13251331

1326-
process_changesets_url_common( url, "", passed_uid,
1332+
process_changesets_url_common( url, "", passed_uid, "",
13271333
passed_min_lat_string, passed_min_lon_string, passed_max_lat_string, passed_max_lon_string,
13281334
passed_download_changeset, passed_building, passed_overlapnodes, passed_download_nodes );
13291335
}
@@ -1341,7 +1347,7 @@ static void process_time( String passed_time,
13411347
URL url;
13421348
url = new URL( api_path + "changesets?time=" + passed_time );
13431349

1344-
process_changesets_url_common( url, "All Users", "",
1350+
process_changesets_url_common( url, "All Users", "", "",
13451351
passed_min_lat_string, passed_min_lon_string, passed_max_lat_string, passed_max_lon_string,
13461352
passed_download_changeset, passed_building, passed_overlapnodes, passed_download_nodes );
13471353
}
@@ -1359,7 +1365,7 @@ static void process_id( String passed_id,
13591365
URL url;
13601366
url = new URL( api_path + "changeset/" + passed_id );
13611367

1362-
process_changesets_url_common( url, "Any User", "",
1368+
process_changesets_url_common( url, "Any User", "", passed_id,
13631369
passed_min_lat_string, passed_min_lon_string, passed_max_lat_string, passed_max_lon_string,
13641370
passed_download_changeset, passed_building, passed_overlapnodes, passed_download_nodes );
13651371
}

0 commit comments

Comments
 (0)