zap the _pdborg suffix when loading entities from pdb.org

PDB is the de-facto standard when loading structures remotely
and shouldn't require any suffix.

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2664 5a81b35b-ba03-0410-adc8-b2c5c5119f08

modules/gui/pymod/scene/file_loader.py

@@ -140,8 +140,11 @@ class GenericLoader(BaseRemoteLoader):
         file_type = remote_url.right(remote_url.size()-index-1)
     if file_type is None:
       file_type = self.file_type_
-    
-    return url+formatted_id +"_"+self.name_+"."+file_type
+    if len(self.name_)>0:
+      print self.name_
+      return url+formatted_id +"_"+self.name_+"."+file_type
+    else:
+      return url+formatted_id+"."+file_type
   
   def HandleError(self, message):
     messageBox =QtGui.QMessageBox(QtGui.QMessageBox.Warning,

modules/gui/pymod/scene/loaders.xml

@@ -2,7 +2,7 @@
 <EMDataInfo>
  <GenericLoaders>
   <GenericLoader ExtName="pdbredo" Name="pdbredo" Url="http://www.cmbi.ru.nl/pdb_redo/ak/${ID}/${ID}_besttls.pdb" />
-  <GenericLoader ExtName="pdborg" Name="pdb.org" Url="http://www.pdb.org/pdb/files/${ID}.pdb" Default="1" />
+  <GenericLoader ExtName="" Name="pdb.org" Url="http://www.pdb.org/pdb/files/${ID}.pdb" Default="1" />
   <GenericLoader ExtName="emdb" Name="emdb" Url="ftp://emdb.rutgers.edu/structures/EMD-${ID}/map/emd_${ID}.map.gz" FileType="map.gz" Img="1"/>  
  </GenericLoaders>
 </EMDataInfo>