1 files changed, 19 insertions, 43 deletions

diff --git a/URPM.xs b/URPM.xs
index 518d773..156d48d 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -2822,39 +2822,22 @@ char *
 Trans_Element_name(trans, index)
   URPM::Transaction trans
   int index
+  ALIAS:
+       Element_version  = 1
+       Element_release  = 2
+       Element_fullname = 3
   CODE:
   rpmte te = rpmtsElement(trans->ts, index);
-  RETVAL = te ? (char *) rpmteN(te) : NULL;
-  OUTPUT:
-  RETVAL
-
-char *
-Trans_Element_version(trans, index)
-  URPM::Transaction trans
-  int index
-  CODE:
-  rpmte te = rpmtsElement(trans->ts, index);
-  RETVAL = te ? (char *) rpmteV(te) : NULL;
-  OUTPUT:
-  RETVAL
-
-char *
-Trans_Element_release(trans, index)
-  URPM::Transaction trans
-  int index
-  CODE:
-  rpmte te = rpmtsElement(trans->ts, index);
-  RETVAL = te ? (char *) rpmteR(te) : NULL;
-  OUTPUT:
-  RETVAL
-
-char *
-Trans_Element_fullname(trans, index)
-  URPM::Transaction trans
-  int index
-  CODE:
-  rpmte te = rpmtsElement(trans->ts, index);
-  RETVAL = te ? (char *) rpmteNEVRA(te) : NULL;
+  if (te) {
+       switch (ix) {
+       case 1:  RETVAL = (char *) rpmteV(te); break;
+       case 2:  RETVAL = (char *) rpmteR(te); break;
+       case 3:  RETVAL = (char *) rpmteNEVRA(te); break;
+       default: RETVAL = (char *) rpmteN(te); break;
+       }
+  } else {
+       RETVAL = NULL;
+  }
   OUTPUT:
   RETVAL
 
@@ -3403,24 +3386,17 @@ Urpm_import_pubkey_file(db, filename)
     RETVAL
 
 int
-Urpm_archscore(arch)
-  const char * arch
+Urpm_archscore(param)
+  const char * param
+  ALIAS:
+         osscore = 1
   PREINIT:
   CODE:
   read_config_files(0);
-  RETVAL=rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch);
+  RETVAL=rpmMachineScore(ix == 0 ? RPM_MACHTABLE_INSTARCH : RPM_MACHTABLE_INSTOS, param);
   OUTPUT:
   RETVAL
 
-int
-Urpm_osscore(os)
-  const char * os
-  PREINIT:
-  CODE:
-  read_config_files(0);
-  RETVAL=rpmMachineScore(RPM_MACHTABLE_INSTOS, os);
-  OUTPUT:
-  RETVAL
 
 void
 Urpm_stream2header(fp)