File tree 3 files changed +16
-6
lines changed
3 files changed +16
-6
lines changed Original file line number Diff line number Diff line change @@ -444,9 +444,11 @@ def parse_remote_metadata(self, timeout=30):
444
444
elif metadataUrl ["type" ] in ["TC211" , "19115" , "19139" ]:
445
445
mdelem = doc .find (
446
446
".//" + nspath_eval ("gmd:MD_Metadata" , namespaces )
447
- ) or doc .find (
448
- ".//" + nspath_eval ("gmi:MI_Metadata" , namespaces )
449
447
)
448
+ if mdelem is None :
449
+ mdelem = doc .find (
450
+ ".//" + nspath_eval ("gmi:MI_Metadata" , namespaces )
451
+ )
450
452
if mdelem is not None :
451
453
metadataUrl ["metadata" ] = MD_Metadata (mdelem )
452
454
else :
Original file line number Diff line number Diff line change @@ -567,9 +567,11 @@ def parse_remote_metadata(self, timeout=30):
567
567
568
568
mdelem = doc .find (
569
569
".//" + util .nspath_eval ("gmd:MD_Metadata" , n .get_namespaces (["gmd" ]))
570
- ) or doc .find (
571
- ".//" + util .nspath_eval ("gmi:MI_Metadata" , n .get_namespaces (["gmi" ]))
572
570
)
571
+ if mdelem is None :
572
+ mdelem = doc .find (
573
+ ".//" + util .nspath_eval ("gmi:MI_Metadata" , n .get_namespaces (["gmi" ]))
574
+ )
573
575
if mdelem is not None :
574
576
metadataUrl ["metadata" ] = MD_Metadata (mdelem )
575
577
continue
Original file line number Diff line number Diff line change @@ -703,8 +703,14 @@ def parse_remote_metadata(self, timeout=30):
703
703
metadataUrl ['metadata' ] = Metadata (mdelem )
704
704
continue
705
705
706
- mdelem = doc .find ('.//' + nspath_eval ('gmd:MD_Metadata' , n .get_namespaces (['gmd' ]))) \
707
- or doc .find ('.//' + nspath_eval ('gmi:MI_Metadata' , n .get_namespaces (['gmi' ])))
706
+ mdelem = doc .find (
707
+ './/' + nspath_eval ('gmd:MD_Metadata' , n .get_namespaces (['gmd' ]))
708
+ )
709
+ if mdelem is None :
710
+ doc .find (
711
+ './/' + nspath_eval ('gmi:MI_Metadata' , n .get_namespaces (['gmi' ]))
712
+ )
713
+
708
714
if mdelem is not None :
709
715
metadataUrl ['metadata' ] = MD_Metadata (mdelem )
710
716
continue
You can’t perform that action at this time.
0 commit comments